summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
diff options
context:
space:
mode:
authorEspen Riskedal <espenr@trolltech.com>2009-08-21 12:53:13 (GMT)
committerEspen Riskedal <espenr@trolltech.com>2009-08-21 12:53:13 (GMT)
commitdf518cf77c9b3a499d26b33890561bd98f50a49b (patch)
tree5de64d96b1c269fd68f0e2d8a20f0b9263d89289 /demos/qtdemo
parent4aa6869877d4906fcfaac5388294748512cace25 (diff)
downloadQt-df518cf77c9b3a499d26b33890561bd98f50a49b.zip
Qt-df518cf77c9b3a499d26b33890561bd98f50a49b.tar.gz
Qt-df518cf77c9b3a499d26b33890561bd98f50a49b.tar.bz2
Rename demobase.pri to symbianpkgrules.pri
demobase.pri sounded to generic, also I changed it to error on !symbian platforms, and test all the places we include it. That makes it more obvious when reading the .pro files that this is actually Symbian spesific stuff, not cross-platform Qt rules. Reviewed-by: axis
Diffstat (limited to 'demos/qtdemo')
-rw-r--r--demos/qtdemo/qtdemo.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 6d3cf7d..011ea0c 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -7,7 +7,7 @@ OBJECTS_DIR = .obj
MOC_DIR = .moc
INSTALLS += target sources
-include($$QT_SOURCE_TREE/demos/demobase.pri)
+
QT += xml network
contains(QT_CONFIG, opengl) {
@@ -69,6 +69,8 @@ ICON = qtdemo.icns
QMAKE_INFO_PLIST = Info_mac.plist
}
+symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+
# install
target.path = $$[QT_INSTALL_BINS]
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist