diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 15:04:52 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 15:04:52 +1000 |
commit | c839f1340cfef41696647de9ee71edc2389452ce (patch) | |
tree | a518c300fd91b08602656f947c505fe70cca54e1 | |
parent | c0948a08cd8b6c2f7c7c939477b8a5e24624bf54 (diff) | |
parent | ca4eb890b701035dfd472e0fb9aab23a9733a01d (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging:
remove usage of QT_SOURCE_TREE from sensor module
-rw-r--r-- | src/imports/qimportbase.pri | 4 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 8647f05c..405af24e 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/sensors/sensors.pro b/src/sensors/sensors.pro index 0bdd6487..c04354d3 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -13,7 +13,7 @@ QT = core DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL -include($$QT_SOURCE_TREE/src/qbase.pri) +load(qt_module_config) HEADERS += qtsensorsversion.h |