From 01335edc94d2961bd4061ed2cb81ebd1151797bf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 31 Aug 2011 16:43:22 +0200 Subject: Fix export symbols for QtDeclarative and QtQuick1. Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- modules/qt_qmltest.pri | 2 +- modules/qt_qtquick1.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/qt_qmltest.pri b/modules/qt_qmltest.pri index 9cc2977837..d00f621237 100644 --- a/modules/qt_qmltest.pri +++ b/modules/qt_qmltest.pri @@ -12,6 +12,6 @@ QT.qmltest.libs = $$QT_MODULE_LIB_BASE QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE QT.qmltest.depends = declarative testlib -QT.qmltest.DEFINES = QT_DECLARATIVE_LIB +QT.qmltest.DEFINES = QT_QMLTEST_LIB QT_CONFIG += qmltest diff --git a/modules/qt_qtquick1.pri b/modules/qt_qtquick1.pri index 173c3da684..70a290637b 100644 --- a/modules/qt_qtquick1.pri +++ b/modules/qt_qtquick1.pri @@ -12,6 +12,6 @@ QT.qtquick1.libs = $$QT_MODULE_LIB_BASE QT.qtquick1.plugins = $$QT_MODULE_PLUGIN_BASE QT.qtquick1.imports = $$QT_MODULE_IMPORT_BASE QT.qtquick1.depends = declarative -QT.qtquick1.DEFINES = QT_DECLARATIVE_LIB +QT.qtquick1.DEFINES = QT_QTQUICK1_LIB QT_CONFIG += qtquick1 -- cgit v1.2.3