diff options
| author | axis <qt-info@nokia.com> | 2011-05-30 16:11:05 +0200 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-06-07 05:34:30 -0500 |
| commit | 50ccddca51daf995c5cc9505f36c9acc979e0f25 (patch) | |
| tree | ed2529952a230c8560d597c5b7dcfda16dc4b124 | |
| parent | 8b5b68ba41da1b7f93dfa6164fb7c3b00c832aae (diff) | |
| download | qtdeclarative-50ccddca51daf995c5cc9505f36c9acc979e0f25.tar.gz | |
Use feature profile loading instead of direct inclusion.
| -rw-r--r-- | src/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | src/imports/qimportbase.pri | 4 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index adf1408c58..cbd7d24753 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -19,7 +19,7 @@ exists("qdeclarative_enable_gcov") { LIBS += -lgcov } -include($$QT_SOURCE_TREE/src/qbase.pri) +load(qt_module_config) HEADERS += qtdeclarativeversion.h diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 8647f05cb9..405af24ece 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,6 +1,6 @@ load(qt_module) -symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin @@ -27,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -include($$QT_SOURCE_TREE/src/qt_targets.pri) +load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index d7c2061556..385326a806 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = qmldbg_inspector QT += declarative-private -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro index 274888940a..a12fac5da3 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro +++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro @@ -1,7 +1,7 @@ TARGET = qmldbg_ost QT += declarative network -include(../../qpluginbase.pri) +load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index e5e28a4c38..c5f8f90cd6 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = qmldbg_tcp QT += declarative-private network -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" |