From df518cf77c9b3a499d26b33890561bd98f50a49b Mon Sep 17 00:00:00 2001 From: Espen Riskedal Date: Fri, 21 Aug 2009 14:53:13 +0200 Subject: 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 --- demos/affine/affine.pro | 2 +- demos/arthurplugin/arthurplugin.pro | 2 +- demos/books/books.pro | 4 ++-- demos/browser/browser.pro | 7 ++++--- demos/chip/chip.pro | 2 +- demos/composition/composition.pro | 2 +- demos/deform/deform.pro | 7 ++++--- demos/demos.pro | 2 +- demos/embedded/anomaly/anomaly.pro | 3 +-- demos/embedded/desktopservices/desktopservices.pro | 3 +-- demos/embedded/embedded.pro | 2 +- demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro | 7 ++++--- demos/embedded/styledemo/styledemo.pro | 7 ++++--- demos/embeddeddialogs/embeddeddialogs.pro | 2 +- demos/gradients/gradients.pro | 2 +- demos/interview/interview.pro | 2 +- demos/macmainwindow/macmainwindow.pro | 2 -- demos/mainwindow/mainwindow.pro | 2 +- demos/mediaplayer/mediaplayer.pro | 7 ++++--- demos/pathstroke/pathstroke.pro | 7 ++++--- demos/qtdemo/qtdemo.pro | 4 +++- demos/shared/shared.pro | 6 ++++-- demos/spreadsheet/spreadsheet.pro | 2 +- demos/sqlbrowser/sqlbrowser.pro | 2 +- demos/symbianpkgrules.pri | 13 +++++++++++++ demos/textedit/textedit.pro | 2 +- demos/undo/undo.pro | 2 +- 27 files changed, 62 insertions(+), 43 deletions(-) create mode 100644 demos/symbianpkgrules.pri diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro index 4973496..7f9e444 100644 --- a/demos/affine/affine.pro +++ b/demos/affine/affine.pro @@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg sources.path = $$[QT_INSTALL_DEMOS]/affine INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro index d4827a1..3114293 100644 --- a/demos/arthurplugin/arthurplugin.pro +++ b/demos/arthurplugin/arthurplugin.pro @@ -44,7 +44,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png sources.path = $$[QT_INSTALL_DEMOS]/arthurplugin INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) win32-msvc* { QMAKE_CFLAGS += /Zm500 diff --git a/demos/books/books.pro b/demos/books/books.pro index 94b049a..a5e44e5 100644 --- a/demos/books/books.pro +++ b/demos/books/books.pro @@ -13,11 +13,11 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images sources.path = $$[QT_INSTALL_DEMOS]/books INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) wince*: { CONFIG(debug, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll CONFIG(release, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll sqlPlugins.path = sqldrivers DEPLOYMENT += sqlPlugins -} \ No newline at end of file +} diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro index ca00062..f54afe4 100644 --- a/demos/browser/browser.pro +++ b/demos/browser/browser.pro @@ -90,6 +90,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.r sources.path = $$[QT_INSTALL_DEMOS]/browser INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000CF70 +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000CF70 +} diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro index a24a634..4339f82 100644 --- a/demos/chip/chip.pro +++ b/demos/chip/chip.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images sources.path = $$[QT_INSTALL_DEMOS]/chip INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro index 90562eb..c820a8b 100644 --- a/demos/composition/composition.pro +++ b/demos/composition/composition.pro @@ -17,7 +17,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/composition INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) win32-msvc* { QMAKE_CXXFLAGS += /Zm500 diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro index 31ba2e9..4cce195 100644 --- a/demos/deform/deform.pro +++ b/demos/deform/deform.pro @@ -18,6 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/deform INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000A63D +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000A63D +} diff --git a/demos/demos.pro b/demos/demos.pro index d734c05..c4b8872 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -44,7 +44,7 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS] INSTALLS += sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) demos_chip.subdir = chip demos_embeddeddialogs.subdir = embeddeddialogs 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 +} diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro index d9948a9..d3ef442 100644 --- a/demos/embeddeddialogs/embeddeddialogs.pro +++ b/demos/embeddeddialogs/embeddeddialogs.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.ic sources.path = $$[QT_INSTALL_DEMOS]/embeddeddialogs INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro index 7789896..21cd57d 100644 --- a/demos/gradients/gradients.pro +++ b/demos/gradients/gradients.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/gradients INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro index 0faa21f..1e5f9b8 100644 --- a/demos/interview/interview.pro +++ b/demos/interview/interview.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images sources.path = $$[QT_INSTALL_DEMOS]/interview INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro index f7592ed..ba6ffbb 100644 --- a/demos/macmainwindow/macmainwindow.pro +++ b/demos/macmainwindow/macmainwindow.pro @@ -20,6 +20,4 @@ target.path = $$[QT_INSTALL_DEMOS]/macmainwindow sources.files = $$SOURCES *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/macmainwindow INSTALLS += target sources - -include($$QT_SOURCE_TREE/demos/demobase.pri) } diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro index 87b42be..8e9bdc2 100644 --- a/demos/mainwindow/mainwindow.pro +++ b/demos/mainwindow/mainwindow.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro sources.path = $$[QT_INSTALL_DEMOS]/mainwindow INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro index ef07a3f..49a652e 100644 --- a/demos/mediaplayer/mediaplayer.pro +++ b/demos/mediaplayer/mediaplayer.pro @@ -25,6 +25,7 @@ wince*{ DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout } -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000C613 \ No newline at end of file +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000C613 +} diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro index ce6ab3d..ac50842 100644 --- a/demos/pathstroke/pathstroke.pro +++ b/demos/pathstroke/pathstroke.pro @@ -18,6 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/pathstroke INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) - -symbian:TARGET.UID3 = 0xA000A63E \ No newline at end of file +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000A63E +} 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 diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro index a5e0e70..de29857 100644 --- a/demos/shared/shared.pro +++ b/demos/shared/shared.pro @@ -30,7 +30,9 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images sources.path = $$[QT_INSTALL_DEMOS]/shared INSTALLS += sources -include($$QT_SOURCE_TREE/demos/demobase.pri) !cross_compile:INSTALLS += target -symbian:TARGET.UID3 = 0xA000A63C +symbian { + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.UID3 = 0xA000A63C +} diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro index 102b75d..6b38abe 100644 --- a/demos/spreadsheet/spreadsheet.pro +++ b/demos/spreadsheet/spreadsheet.pro @@ -31,4 +31,4 @@ sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro index 1334bc1..3a8036d 100644 --- a/demos/sqlbrowser/sqlbrowser.pro +++ b/demos/sqlbrowser/sqlbrowser.pro @@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro sources.path = $$[QT_INSTALL_DEMOS]/sqlbrowser INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri new file mode 100644 index 0000000..7e6852b --- /dev/null +++ b/demos/symbianpkgrules.pri @@ -0,0 +1,13 @@ +!symbian: error(Only include this file for Symbian platforms) + +RSS_RULES ="group_name=\"QtDemos\";" + +vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + +default_deployment.pkg_prerules += vendorinfo diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro index 8b29a45..9669ec8 100644 --- a/demos/textedit/textedit.pro +++ b/demos/textedit/textedit.pro @@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images sources.path = $$[QT_INSTALL_DEMOS]/textedit INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro index a4257cd..0667bdd 100644 --- a/demos/undo/undo.pro +++ b/demos/undo/undo.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS sources.path = $$[QT_INSTALL_DEMOS]/undo INSTALLS += target sources -include($$QT_SOURCE_TREE/demos/demobase.pri) +symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) -- cgit v0.12