diff options
| author | Espen Riskedal <espenr@trolltech.com> | 2009-08-21 12:53:13 (GMT) |
|---|---|---|
| committer | Espen Riskedal <espenr@trolltech.com> | 2009-08-21 12:53:13 (GMT) |
| commit | df518cf77c9b3a499d26b33890561bd98f50a49b (patch) | |
| tree | 5de64d96b1c269fd68f0e2d8a20f0b9263d89289 /demos/embedded | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
| download | Qt-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/embedded')
| -rw-r--r-- | demos/embedded/anomaly/anomaly.pro | 3 | ||||
| -rw-r--r-- | demos/embedded/desktopservices/desktopservices.pro | 3 | ||||
| -rw-r--r-- | demos/embedded/embedded.pro | 2 | ||||
| -rw-r--r-- | demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro | 7 | ||||
| -rw-r--r-- | demos/embedded/styledemo/styledemo.pro | 7 |
5 files changed, 11 insertions, 11 deletions
diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro index cf9277e..8fb1265 100644 --- a/demos/embedded/anomaly/anomaly.pro +++ b/demos/embedded/anomaly/anomaly.pro @@ -21,9 +21,8 @@ SOURCES += src/Main.cpp \ src/ControlStrip.cpp RESOURCES += src/anomaly.qrc -include($$QT_SOURCE_TREE/demos/demobase.pri) - symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h LIBS += -lesock -lconnmon TARGET.CAPABILITY = NetworkServices diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro index 32dfa40..81fe16d 100644 --- a/demos/embedded/desktopservices/desktopservices.pro +++ b/demos/embedded/desktopservices/desktopservices.pro @@ -15,9 +15,8 @@ image.path = /data/images/ DEPLOYMENT += music image -include($$QT_SOURCE_TREE/demos/demobase.pri) - symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.UID3 = 0xA000C611 ICON = ./resources/heart.svg } diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index d0fb40a..3d814f7 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -24,4 +24,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS]/embedded INSTALLS += sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro index 3ce2fbf..9401871 100644 --- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro @@ -15,6 +15,7 @@ wince* { DEPLOYMENT_PLUGIN += qsvg } -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000A640 +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000A640 +} diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro index e0ef202..7107798 100644 --- a/demos/embedded/styledemo/styledemo.pro +++ b/demos/embedded/styledemo/styledemo.pro @@ -11,6 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000A63F +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000A63F +} |