diff options
Diffstat (limited to 'demos')
21 files changed, 64 insertions, 21 deletions
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro index 6c5f005..a42aa60 100644 --- a/demos/browser/browser.pro +++ b/demos/browser/browser.pro @@ -3,7 +3,7 @@ TARGET = browser QT += webkit network CONFIG += qt warn_on -contains(QT_BUILD_PARTS, tools):!symbian:!embedded: CONFIG += uitools +contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools else: DEFINES += QT_NO_UITOOLS release:DEFINES+=QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT diff --git a/demos/demos.pro b/demos/demos.pro index c4b8872..5e400ea 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -26,7 +26,7 @@ SUBDIRS += demos_boxes } mac*: SUBDIRS += demos_macmainwindow -wince*|symbian|embedded: SUBDIRS += embedded +wince*|symbian|embedded|x11: SUBDIRS += embedded !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin @@ -64,7 +64,7 @@ demos_arthurplugin.subdir = arthurplugin demos_sqlbrowser.subdir = sqlbrowser demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo -demos_mediaplayer.subdir = mediaplayer +demos_mediaplayer.subdir = qmediaplayer demos_browser.subdir = browser diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro index 06d73fa..2871ba7 100644 --- a/demos/embedded/anomaly/anomaly.pro +++ b/demos/embedded/anomaly/anomaly.pro @@ -24,8 +24,13 @@ RESOURCES += src/anomaly.qrc symbian { TARGET.UID3 = 0xA000CF71 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h + HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -linsock -lconnmon TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/anomaly +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro src/images +sources.path = $$[QT_INSTALL_DEMOS]/embedded/anomaly +INSTALLS += target sources diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro index c160029c..bff7c46 100644 --- a/demos/embedded/desktopservices/desktopservices.pro +++ b/demos/embedded/desktopservices/desktopservices.pro @@ -8,15 +8,25 @@ SOURCES += desktopwidget.cpp contenttab.cpp linktab.cpp main.cpp RESOURCES += desktopservices.qrc music.sources = data/*.mp3 data/*.wav -music.path = /data/sounds/ - image.sources = data/*.png -image.path = /data/images/ -DEPLOYMENT += music image +target.path = $$[QT_INSTALL_DEMOS]/embedded/desktopservices +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/desktopservices symbian { TARGET.UID3 = 0xA000C611 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) ICON = ./resources/heart.svg + music.path = /data/sounds/ + image.path = /data/images/ + DEPLOYMENT += music image +} + +wince*{ + music.path = "\My Documents\My Music" + image.path = "\My Documents\My Pictures" + DEPLOYMENT += music image } + +INSTALLS += target sources diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro index 72cdc0f..4af9973 100644 --- a/demos/embedded/digiflip/digiflip.pro +++ b/demos/embedded/digiflip/digiflip.pro @@ -5,3 +5,7 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) } +target.path = $$[QT_INSTALL_DEMOS]/embedded/digiflip +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/digiflip +INSTALLS += target sources diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro index 731dcbe..1052330 100644 --- a/demos/embedded/flickable/flickable.pro +++ b/demos/embedded/flickable/flickable.pro @@ -5,3 +5,8 @@ symbian { TARGET.UID3 = 0xA000CF73 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/flickable +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/flickable +INSTALLS += target sources diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index 5659fa2..8e5535c 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -8,7 +8,12 @@ QT += network symbian { TARGET.UID3 = 0xA000CF74 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h + HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/flightinfo +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/flightinfo +INSTALLS += target sources diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml index fefa3dd..2c61baf 100644 --- a/demos/embedded/fluidlauncher/config_s60/config.xml +++ b/demos/embedded/fluidlauncher/config_s60/config.xml @@ -6,7 +6,7 @@ <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/> <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/> <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly_s60.png" args="-small-screen"/> - <example filename="ftp" name="Ftp Client" image="screenshots/ftp_s60.png"/> + <example filename="qftp" name="Ftp Client" image="screenshots/ftp_s60.png"/> <example filename="context2d" name="Context2d" image="screenshots/context2d_s60.png" args="-small-screen"/> <example filename="saxbookmarks" name="SaxBookmarks" image="screenshots/saxbookmarks_s60.png"/> <example filename="desktopservices" name="Desktop Services" image="screenshots/desktopservices_s60.png"/> diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index f2abde6..dd931e6 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -66,7 +66,7 @@ symbian { deform.exe \ pathstroke.exe \ wiggly.exe \ - ftp.exe \ + qftp.exe \ saxbookmarks.exe \ desktopservices.exe \ fridgemagnets.exe \ @@ -85,7 +85,7 @@ symbian { $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \ - $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/ftp_reg.rsc\ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \ $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \ @@ -109,7 +109,7 @@ symbian { $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \ - $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/ftp.rsc\ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \ $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \ diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index 122865e..c9bfa0a 100644 --- a/demos/embedded/lightmaps/lightmaps.pro +++ b/demos/embedded/lightmaps/lightmaps.pro @@ -5,8 +5,13 @@ QT += network symbian { TARGET.UID3 = 0xA000CF75 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h + HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/lightmaps +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/lightmaps +INSTALLS += target sources diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro index 8dd8a24..82d0812 100644 --- a/demos/embedded/raycasting/raycasting.pro +++ b/demos/embedded/raycasting/raycasting.pro @@ -6,3 +6,8 @@ symbian { TARGET.UID3 = 0xA000CF76 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/raycasting +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/raycasting +INSTALLS += target sources diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro index 5b2f03a..57f1684 100644 --- a/demos/embedded/weatherinfo/weatherinfo.pro +++ b/demos/embedded/weatherinfo/weatherinfo.pro @@ -7,7 +7,12 @@ QT += network svg symbian { TARGET.UID3 = 0xA000CF77 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h + HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices } + +target.path = $$[QT_INSTALL_DEMOS]/embedded/weatherinfo +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro +sources.path = $$[QT_INSTALL_DEMOS]/embedded/weatherinfo +INSTALLS += target sources diff --git a/demos/mediaplayer/images/screen.png b/demos/qmediaplayer/images/screen.png Binary files differindex a15df92..a15df92 100644 --- a/demos/mediaplayer/images/screen.png +++ b/demos/qmediaplayer/images/screen.png diff --git a/demos/mediaplayer/main.cpp b/demos/qmediaplayer/main.cpp index 66aa445..66aa445 100644 --- a/demos/mediaplayer/main.cpp +++ b/demos/qmediaplayer/main.cpp diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp index baac236..baac236 100644 --- a/demos/mediaplayer/mediaplayer.cpp +++ b/demos/qmediaplayer/mediaplayer.cpp diff --git a/demos/mediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h index 40ffa40..40ffa40 100644 --- a/demos/mediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h diff --git a/demos/mediaplayer/mediaplayer.qrc b/demos/qmediaplayer/mediaplayer.qrc index bcdf404..bcdf404 100644 --- a/demos/mediaplayer/mediaplayer.qrc +++ b/demos/qmediaplayer/mediaplayer.qrc diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index a420cc3..2f15c28 100644 --- a/demos/mediaplayer/mediaplayer.pro +++ b/demos/qmediaplayer/qmediaplayer.pro @@ -3,7 +3,6 @@ ###################################################################### TEMPLATE = app -TARGET = qmediaplayer DEPENDPATH += . build src ui QT += phonon @@ -18,7 +17,7 @@ HEADERS += mediaplayer.h target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/mediaplayer +sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer INSTALLS += target sources wince*{ diff --git a/demos/mediaplayer/settings.ui b/demos/qmediaplayer/settings.ui index d2cedd4..d2cedd4 100644 --- a/demos/mediaplayer/settings.ui +++ b/demos/qmediaplayer/settings.ui diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 3f0cd25..83bd200 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -121,7 +121,7 @@ <example filename="network-chat" name="Network Chat Client" /> <example filename="fortuneclient" name="Fortune Client" /> <example filename="fortuneserver" name="Fortune Server" /> - <example filename="ftp" changedirectory="false" name="FTP Client" /> + <example filename="qftp" changedirectory="false" name="FTP Client" /> <example filename="http" changedirectory="false" name="HTTP Client" /> <example filename="loopback" name="Loopback" /> <example filename="threadedfortuneserver" name="Threaded Fort. Server" /> @@ -152,9 +152,9 @@ <example filename="transformations" name="Transformations" /> </category> <category dirname="phonon" name="Phonon"> - <example filename="musicplayer" name="Music Player" /> + <example filename="qmusicplayer" name="Music Player" /> </category> - <category dirname="multimedia/audio" name="Multimedia"> + <category dirname="multimedia" name="Multimedia"> <example filename="audiodevices" name="Audio Devices" /> <example filename="audiooutput" name="Audio Output" /> <example filename="audioinput" name="Audio Input" /> diff --git a/demos/sub-attaq/boat.cpp b/demos/sub-attaq/boat.cpp index 3b1bac7..cb40329 100644 --- a/demos/sub-attaq/boat.cpp +++ b/demos/sub-attaq/boat.cpp @@ -87,7 +87,7 @@ Boat::Boat() : PixmapItem(QString("boat"), GraphicsScene::Big), speed(0), bombsAlreadyLaunched(0), direction(Boat::None), movementAnimation(0) { setZValue(4); - setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsFocusable); + setFlags(QGraphicsItem::ItemIsFocusable); //The movement animation used to animate the boat movementAnimation = new QPropertyAnimation(this, "pos"); |
