diff options
Diffstat (limited to 'demos')
24 files changed, 24 insertions, 81 deletions
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro index 4f869987b9..a3d6e30ad1 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]/qtbase/affine INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/demos/books/books.pro b/demos/books/books.pro index ad4009035c..1588288f3e 100644 --- a/demos/books/books.pro +++ b/demos/books/books.pro @@ -13,7 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images sources.path = $$[QT_INSTALL_DEMOS]/qtbase/books INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro index 8ff2aa45f1..1e1a7de735 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]/qtbase/chip INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro index bb5cac5dea..59b91126b9 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]/qtbase/composition INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo win32-msvc* { QMAKE_CXXFLAGS += /Zm500 diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro index ee15d2cc3e..3393b8e83c 100644 --- a/demos/deform/deform.pro +++ b/demos/deform/deform.pro @@ -20,5 +20,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63D - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/demos.pro b/demos/demos.pro index f1d5b009a8..81968fd61d 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -48,25 +48,18 @@ SUBDIRS += demos_boxes mac* && !qpa: SUBDIRS += demos_macmainwindow wince*|symbian|embedded|x11: SUBDIRS += demos_embedded -!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin - !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ -!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -wince*:SUBDIRS += demos_sqlbrowser +SUBDIRS += demos_sqlbrowser } } -contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer -contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser -contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative -contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS] INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo demos_chip.subdir = chip demos_embeddeddialogs.subdir = embeddeddialogs @@ -89,20 +82,9 @@ demos_arthurplugin.subdir = arthurplugin demos_sqlbrowser.subdir = sqlbrowser demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo -demos_mediaplayer.subdir = qmediaplayer -demos_declarative.subdir = declarative - -#mobile demos. Requires QtMobility sources. Not included in demo build -demos_guitartuner.subdir = mobile/guitartuner -demos_qcamera.subdir = mobile/qcamera -demos_qtbubblelevel.subdir = mobile/qtbubblelevel -demos_quickhit.subdir = mobile/quickhit - -demos_browser.subdir = browser demos_boxes.subdir = boxes demos_sub-attaq.subdir = sub-attaq -demos_spectrum.subdir = spectrum #CONFIG += ordered !ordered { diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro index 73309db9e5..7fa06fa90a 100644 --- a/demos/embedded/digiflip/digiflip.pro +++ b/demos/embedded/digiflip/digiflip.pro @@ -2,7 +2,7 @@ SOURCES = digiflip.cpp symbian { TARGET.UID3 = 0xA000CF72 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index efe3af5122..e9a448b1e3 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -1,32 +1,12 @@ TEMPLATE = subdirs SUBDIRS = styledemo raycasting flickable digiflip -contains(QT_CONFIG, svg) { - SUBDIRS += embeddedsvgviewer \ - desktopservices - fluidlauncher.subdir = fluidlauncher - fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo - !vxworks:!qnx:SUBDIRS += fluidlauncher -} - SUBDIRS += lightmaps SUBDIRS += flightinfo -contains(QT_CONFIG, svg) { - SUBDIRS += weatherinfo -} - -contains(QT_CONFIG, webkit) { - SUBDIRS += anomaly -} - -contains(QT_CONFIG, declarative) { - # Qml demos require DEPLOYMENT support. Therefore, only symbian. - symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter -} # install sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro index 0fa15d939f..6ee744bc63 100644 --- a/demos/embedded/flickable/flickable.pro +++ b/demos/embedded/flickable/flickable.pro @@ -3,7 +3,7 @@ HEADERS = flickable.h symbian { TARGET.UID3 = 0xA000CF73 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index c015fdf0af..a33423f543 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -7,7 +7,7 @@ QT += network symbian { TARGET.UID3 = 0xA000CF74 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices } diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index a792e60709..2751c3a647 100644 --- a/demos/embedded/lightmaps/lightmaps.pro +++ b/demos/embedded/lightmaps/lightmaps.pro @@ -10,7 +10,7 @@ QT += network symbian { TARGET.UID3 = 0xA000CF75 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro index bc1692a458..a4bb1826b9 100644 --- a/demos/embedded/raycasting/raycasting.pro +++ b/demos/embedded/raycasting/raycasting.pro @@ -4,7 +4,7 @@ RESOURCES += raycasting.qrc symbian { TARGET.UID3 = 0xA000CF76 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro index 81a45403ad..60700dd1df 100644 --- a/demos/embedded/styledemo/styledemo.pro +++ b/demos/embedded/styledemo/styledemo.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63F - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro index 7e403112aa..675a9889a2 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]/qtbase/embeddeddialogs INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro index ba8910351a..ed4120e01c 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]/qtbase/gradients INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro index c69f7ba975..a497fbc407 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]/qtbase/interview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro index 1e9d513c0a..6da113d722 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]/qtbase/mainwindow INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro index dd95c72769..9bbf8a6f77 100644 --- a/demos/pathstroke/pathstroke.pro +++ b/demos/pathstroke/pathstroke.pro @@ -20,5 +20,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63E - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro index 4fc3809be0..b2a338e7f3 100644 --- a/demos/shared/shared.pro +++ b/demos/shared/shared.pro @@ -34,5 +34,5 @@ INSTALLS += sources symbian { TARGET.UID3 = 0xA000A63C - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro index 8f414b8596..7179d98eba 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]/qtbase/spreadsheet INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro index 8b089d1ebd..dc6214622c 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]/qtbase/sqlbrowser INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri deleted file mode 100644 index ef6dfd8419..0000000000 --- a/demos/symbianpkgrules.pri +++ /dev/null @@ -1,19 +0,0 @@ -!symbian: error(Only include this file for Symbian platforms) - -RSS_RULES ="group_name=\"QtDemos\";" - -nokiaVendor = "Nokia, Qt" -vendorinfo = \ - "; Localised Vendor name" \ - "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \ - " " \ - "; Unique Vendor name" \ - ":\"$$nokiaVendor\"" \ - " " - -demos_deployment.pkg_prerules += vendorinfo -DEPLOYMENT += demos_deployment - -isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { - ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg -} diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro index 129b8fb519..b37ac3036a 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]/qtbase/textedit INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro index ba647cb95d..84f1d7b326 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]/qtbase/undo INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo |