diff options
27 files changed, 62 insertions, 43 deletions
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro index 4973496915..7f9e444515 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 d4827a150a..311429373a 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 94b049a9f6..a5e44e5877 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 ca000629d3..f54afe44cc 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 a24a634387..4339f82a90 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 90562eb3b9..c820a8bc31 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 31ba2e9bb7..4cce195d7d 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 d734c05e92..c4b88725d4 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 cf9277e4aa..8fb12656df 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 32dfa40dd4..81fe16dbb4 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 d0fb40af83..3d814f7a35 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 3ce2fbf649..9401871882 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 e0ef202526..7107798e2a 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 d9948a939b..d3ef44286b 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 77898961ae..21cd57d10a 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 0faa21ff47..1e5f9b8172 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 f7592ed037..ba6ffbbe23 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 87b42becbe..8e9bdc2717 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 ef07a3f6e1..49a652e4e8 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 ce6ab3d8b8..ac50842405 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 6d3cf7d9d8..011ea0c416 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 a5e0e700c9..de29857f15 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 102b75d02f..6b38abe35e 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 1334bc1370..3a8036d0ff 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 0000000000..7e6852bd46 --- /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 8b29a456c5..9669ec8916 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 a4257cd1c7..0667bdd927 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) |