From 66a3c0d7a18008920ae112abf8640b2dcef04d9f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 6 Dec 2011 13:43:06 +0100 Subject: [PATCH] Fix linking of QtQuick.dll on Windows. Put class QDeclarativeComponentAttached into a separate header. When declared as Q_AUTOTEST_EXPORT in declarative/qml/qdeclarativecomponent_p.h which is included by quick/qquickloader.cpp, the Q_AUTOTEST_EXPORT is seen as __declspec(dllexport) and linking fails. Change-Id: I835197e3af6993cfd9325a432f33c636b9bfd3e6 Reviewed-by: Alan Alpert --- src/declarative/qml/qdeclarativecomponent.cpp | 1 + src/declarative/qml/qdeclarativecomponent_p.h | 28 ------- .../qml/qdeclarativecomponentattached_p.h | 86 ++++++++++++++++++++ src/declarative/qml/qdeclarativecontext.cpp | 1 + src/declarative/qml/qdeclarativeengine.cpp | 1 + src/declarative/qml/qdeclarativevme.cpp | 1 + src/declarative/qml/qml.pri | 3 +- 7 files changed, 92 insertions(+), 29 deletions(-) create mode 100644 src/declarative/qml/qdeclarativecomponentattached_p.h diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 3231bb9..9a7d771 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -41,6 +41,7 @@ #include "qdeclarativecomponent.h" #include "qdeclarativecomponent_p.h" +#include "qdeclarativecomponentattached_p.h" #include "qdeclarativecompiler_p.h" #include "qdeclarativecontext_p.h" diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index 1e6cbc8..781a52d 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -124,34 +124,6 @@ public: } }; -class Q_AUTOTEST_EXPORT QDeclarativeComponentAttached : public QObject -{ - Q_OBJECT -public: - QDeclarativeComponentAttached(QObject *parent = 0); - ~QDeclarativeComponentAttached(); - - void add(QDeclarativeComponentAttached **a) { - prev = a; next = *a; *a = this; - if (next) next->prev = &next; - } - void rem() { - if (next) next->prev = prev; - *prev = next; - next = 0; prev = 0; - } - QDeclarativeComponentAttached **prev; - QDeclarativeComponentAttached *next; - -Q_SIGNALS: - void completed(); - void destruction(); - -private: - friend class QDeclarativeVME; - friend class QDeclarativeContextData; -}; - QT_END_NAMESPACE #endif // QDECLARATIVECOMPONENT_P_H diff --git a/src/declarative/qml/qdeclarativecomponentattached_p.h b/src/declarative/qml/qdeclarativecomponentattached_p.h new file mode 100644 index 0000000..93a8ff2 --- /dev/null +++ b/src/declarative/qml/qdeclarativecomponentattached_p.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVECOMPONENTATTACHED_P_H +#define QDECLARATIVECOMPONENTATTACHED_P_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Declarative) + +class Q_AUTOTEST_EXPORT QDeclarativeComponentAttached : public QObject +{ + Q_OBJECT +public: + QDeclarativeComponentAttached(QObject *parent = 0); + ~QDeclarativeComponentAttached(); + + void add(QDeclarativeComponentAttached **a) { + prev = a; next = *a; *a = this; + if (next) next->prev = &next; + } + void rem() { + if (next) next->prev = prev; + *prev = next; + next = 0; prev = 0; + } + QDeclarativeComponentAttached **prev; + QDeclarativeComponentAttached *next; + +Q_SIGNALS: + void completed(); + void destruction(); + +private: + friend class QDeclarativeVME; + friend class QDeclarativeContextData; +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QDECLARATIVECOMPONENTATTACHED_P_H diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 50e2235..0d8970b 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -41,6 +41,7 @@ #include "qdeclarativecontext.h" #include "qdeclarativecontext_p.h" +#include "qdeclarativecomponentattached_p.h" #include "qdeclarativecomponent_p.h" #include "qdeclarativeexpression_p.h" diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 7d5bb59..49239ae 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -41,6 +41,7 @@ #include "qdeclarativeengine_p.h" #include "qdeclarativeengine.h" +#include "qdeclarativecomponentattached_p.h" #include "qdeclarativecontext_p.h" #include "qdeclarativecompiler_p.h" diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 556e2a2..aa31cad 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -52,6 +52,7 @@ #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" #include "qdeclarativecomponent.h" +#include "qdeclarativecomponentattached_p.h" #include "qdeclarativebinding_p.h" #include "qdeclarativeengine_p.h" #include "qdeclarativecomponent_p.h" diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 890eadf..d5f57e7 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -117,7 +117,8 @@ HEADERS += \ $$PWD/qdeclarativenullablevalue_p_p.h \ $$PWD/qdeclarativescriptstring_p.h \ $$PWD/qdeclarativelocale_p.h \ - $$PWD/qlistmodelinterface_p.h + $$PWD/qlistmodelinterface_p.h \ + $$PWD/qdeclarativecomponentattached_p.h QT += sql include(parser/parser.pri) -- 1.7.2.5