diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-25 11:30:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 18:43:08 +0200 |
| commit | 9738c4b4765bb641f2f080e02ae6867b3e18d8a3 (patch) | |
| tree | 092e90540366b5438a8db924191c1b0cda2b3928 /src | |
| parent | e58931462e3c32434d070058b87e5d9152ed004e (diff) | |
put private Qt dependencies below load(qt_module_config)
this will soon be needed to omit them from the master include header.
Change-Id: I8f62a228a68fd53605eaf3f39f412a7b30c529b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/particles/particles.pro | 5 | ||||
| -rw-r--r-- | src/qml/qml.pro | 5 | ||||
| -rw-r--r-- | src/qmltest/qmltest.pro | 5 | ||||
| -rw-r--r-- | src/quick/quick.pro | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 3aff6bbcc0..4a3b868c05 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -6,7 +6,7 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI = ../../modules/qt_quickparticles.pri -QT = core-private gui-private v8-private qml-private quick-private +QT = core-private gui-private qml-private quick-private DEFINES += QT_BUILD_QUICKPARTICLES_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS @@ -20,6 +20,9 @@ exists("qqml_enable_gcov") { MODULE = quickparticles load(qt_module_config) +# private dependencies +QT += v8-private + include(particles.pri) mac { diff --git a/src/qml/qml.pro b/src/qml/qml.pro index acafb9f6a3..0af39dae23 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_qml.pri -QT = core-private network v8-private +QT = core-private network DEFINES += QT_BUILD_QML_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES @@ -23,6 +23,9 @@ exists("qqml_enable_gcov") { load(qt_module_config) +# private dependencies +QT += v8-private + HEADERS += qtqmlversion.h \ qtqmlglobal.h \ qtqmlglobal_p.h diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 3e3adaba99..c11b31212f 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -7,11 +7,14 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI += ../../modules/qt_qmltest.pri -QT += testlib testlib-private qml quick gui +QT += qml testlib-private DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING load(qt_module_config) +# private dependencies +QT += quick + # Install qmltestcase.prf into the Qt mkspecs so that "CONFIG += qmltestcase" # can be used in customer applications to build against QtQuickTest. feature.path = $$[QT_INSTALL_DATA]/mkspecs/features diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 87d4c90509..7f7a0c2c18 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -6,7 +6,7 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI = ../../modules/qt_quick.pri -QT = core-private gui gui-private network v8-private qml qml-private +QT = core-private gui-private qml-private DEFINES += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS @@ -19,6 +19,9 @@ exists("qqml_enable_gcov") { load(qt_module_config) +# private dependencies +QT += v8-private network + include(util/util.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) |