summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:51:06 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:51:06 +1000
commit9fef9f368f3a9522b81f4f1509decfb5f94461ae (patch)
treecfad01b1f85267f0ef15f249a31b33c196788383
parent1bcd7e566fec6293329587131e754745994bbe88 (diff)
parent17e04f4e88bec7547473fc9a2d9fd34268bd8a42 (diff)
downloadqtscript-9fef9f368f3a9522b81f4f1509decfb5f94461ae.tar.gz
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtscript-staging: Fix usage of QT_SOURCE_TREE
-rw-r--r--examples/script/context2d/context2d.pro2
-rw-r--r--examples/script/qstetrix/qstetrix.pro4
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index de1287a..cdb926d 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -30,5 +30,5 @@ symbian:{
contextScripts.files = scripts
DEPLOYMENT += contextScripts
}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+maemo5: CONFIG += qt_example
diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro
index 4a99a0a..47b72e5 100644
--- a/examples/script/qstetrix/qstetrix.pro
+++ b/examples/script/qstetrix/qstetrix.pro
@@ -15,7 +15,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js
sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix
INSTALLS += target sources
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+symbian: CONFIG += qt_example
+maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)