Skip to content

Commit

Permalink
Fix linking of QtQuick.dll on Windows.
Browse files Browse the repository at this point in the history
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 <alan.alpert@nokia.com>
  • Loading branch information
Friedemann Kleint authored and Qt by Nokia committed Dec 7, 2011
1 parent 3bb47f4 commit 66a3c0d
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 29 deletions.
1 change: 1 addition & 0 deletions src/declarative/qml/qdeclarativecomponent.cpp
Expand Up @@ -41,6 +41,7 @@

#include "qdeclarativecomponent.h"
#include "qdeclarativecomponent_p.h"
#include "qdeclarativecomponentattached_p.h"

#include "qdeclarativecompiler_p.h"
#include "qdeclarativecontext_p.h"
Expand Down
28 changes: 0 additions & 28 deletions src/declarative/qml/qdeclarativecomponent_p.h
Expand Up @@ -124,34 +124,6 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeComponentPrivate : public QObject
}
};

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
86 changes: 86 additions & 0 deletions 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 <QtDeclarative/qdeclarative.h>
#include <QtCore/QObject>

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
1 change: 1 addition & 0 deletions src/declarative/qml/qdeclarativecontext.cpp
Expand Up @@ -41,6 +41,7 @@

#include "qdeclarativecontext.h"
#include "qdeclarativecontext_p.h"
#include "qdeclarativecomponentattached_p.h"

#include "qdeclarativecomponent_p.h"
#include "qdeclarativeexpression_p.h"
Expand Down
1 change: 1 addition & 0 deletions src/declarative/qml/qdeclarativeengine.cpp
Expand Up @@ -41,6 +41,7 @@

#include "qdeclarativeengine_p.h"
#include "qdeclarativeengine.h"
#include "qdeclarativecomponentattached_p.h"

#include "qdeclarativecontext_p.h"
#include "qdeclarativecompiler_p.h"
Expand Down
1 change: 1 addition & 0 deletions src/declarative/qml/qdeclarativevme.cpp
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/declarative/qml/qml.pri
Expand Up @@ -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)
Expand Down

0 comments on commit 66a3c0d

Please sign in to comment.