Changeset 846 for trunk/demos/embedded/fluidlauncher

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/embedded/fluidlauncher/config_s60/config.xml (modified) (1 diff)
• demos/embedded/fluidlauncher/demoapplication.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/demoapplication.h (modified) (1 diff)
• demos/embedded/fluidlauncher/fluidlauncher.cpp (modified) (2 diffs)
• demos/embedded/fluidlauncher/fluidlauncher.h (modified) (1 diff)
• demos/embedded/fluidlauncher/fluidlauncher.pro (modified) (6 diffs)
• demos/embedded/fluidlauncher/main.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/pictureflow.cpp (modified) (2 diffs)
• demos/embedded/fluidlauncher/pictureflow.h (modified) (1 diff)
• demos/embedded/fluidlauncher/screenshots/qmlcalculator.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmlcalculator.png )
• demos/embedded/fluidlauncher/screenshots/qmlclocks.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmlclocks.png )
• demos/embedded/fluidlauncher/screenshots/qmldialcontrol.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmldialcontrol.png )
• demos/embedded/fluidlauncher/screenshots/qmleasing.png (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmleasing.png )
• demos/embedded/fluidlauncher/screenshots/qmlflickr.jpg (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmlflickr.jpg )
• demos/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg )
• demos/embedded/fluidlauncher/screenshots/qmltwitter.jpg (copied) (copied from branches/vendor/nokia/qt/4.7.2/demos/embedded/fluidlauncher/screenshots/qmltwitter.jpg )
• demos/embedded/fluidlauncher/slideshow.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/slideshow.h (modified) (1 diff)

trunk/demos/embedded/fluidlauncher/config_s60/config.xml

@@ -22 +22 @@
     <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png" args="-small-screen"/>
     <example filename="spectrum" name="Spectrum Analyzer" image="screenshots/spectrum.png" args="-small-screen"/>
+
+
+
+
+
+
+
   </demos>
   <slideshow timeout="60000" interval="10000">

trunk/demos/embedded/fluidlauncher/demoapplication.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/demos/embedded/fluidlauncher/demoapplication.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/demos/embedded/fluidlauncher/fluidlauncher.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -155 +155 @@
                 DemoApplication* newDemo = new DemoApplication(
                         filename.toString(),
-                        name.isEmpty() ? "Unamed Demo" : name.toString(),
+                        name.isEmpty() ? "Unamed Demo" : name.toString(),
                         image.toString(),
                         args.toString().split(" "));

trunk/demos/embedded/fluidlauncher/fluidlauncher.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

@@ -3 +3 @@
 DEPENDPATH += .
 INCLUDEPATH += .
+
 
 # Input
@@ -58 +59 @@
 symbian {
     load(data_caging_paths)
+
+
 
     TARGET.UID3 = 0xA000A641
-    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
+
+    defineReplace(regResourceDir) {
+        symbian-abld|symbian-sbsv2 {
+            return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
+        } else {
+            return($${QT_BUILD_TREE}/$$1)
+        }
+    }
+
+    defineReplace(appResourceDir) {
+        symbian-abld|symbian-sbsv2 {
+            return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
+        } else {
+            return($${QT_BUILD_TREE}/$$1)
+        }
+    }
 
     executables.sources = \
-        styledemo.exe \
-        deform.exe \
-        pathstroke.exe \
-        wiggly.exe \
-        qftp.exe \
-        saxbookmarks.exe \
-        desktopservices.exe \
-        fridgemagnets.exe \
-        softkeys.exe \
-        raycasting.exe \
-        flickable.exe \
-        digiflip.exe \
-        lightmaps.exe \
-        flightinfo.exe
+        styledemo.exe \
+        deform.exe \
+        pathstroke.exe \
+        wiggly.exe \
+        qftp.exe \
+        saxbookmarks.exe \
+        desktopservices.exe \
+        fridgemagnets.exe \
+        softkeys.exe \
+        raycasting.exe \
+        flickable.exe \
+        digiflip.exe \
+        lightmaps.exe \
+        flightinfo.exe
 
     executables.path = /sys/bin
 
     reg_resource.sources = \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
-        $${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/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 \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/raycasting_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flickable_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/digiflip_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/lightmaps_reg.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flightinfo_reg.rsc
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$\
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$
 
     contains(QT_CONFIG, phonon) {
-        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
+        reg_resource.sources += $$
     }
 
     contains(QT_CONFIG, multimedia) {
-        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
+        reg_resource.sources += $$
     }
 
@@ -108 +126 @@
 
     resource.sources = \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
-        $${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/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 \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.rsc \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.rsc
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$\
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$
 
 
@@ -127 +145 @@
 
     mifs.sources = \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fluidlauncher.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.mif \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.mif
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$ \
+        $$
     mifs.path = $$APP_RESOURCE_DIR
 
     contains(QT_CONFIG, svg) {
         executables.sources += \
-            embeddedsvgviewer.exe \
-            weatherinfo.exe
+            embeddedsvgviewer.exe \
+            weatherinfo.exe
 
         reg_resource.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
-            $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/weatherinfo_reg.rsc
+            $$ \
+            $$
 
         resource.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
-
-        mifs.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.mif \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.mif
+            $$ \
+            $$
+
+        mifs.sources += \
+            $$ \
+            $$
 
     }
     contains(QT_CONFIG, webkit) {
-        executables.sources += anomaly.exe
-        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
-        mifs.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
+        executables.sources += anomaly.exe
+        reg_resource.sources += $$
+        resource.sources += $$
+        mifs.sources += \
+            $$
 
         isEmpty(QT_LIBINFIX) {
@@ -178 +196 @@
 
     contains(QT_CONFIG, phonon) {
-        executables.sources += qmediaplayer.exe
-        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
-        mifs.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
+        executables.sources += qmediaplayer.exe
+        resource.sources += $$
+        mifs.sources += \
+            $$
     }
 
     contains(QT_CONFIG, multimedia) {
-        executables.sources += spectrum.exe fftreal.dll
-        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
-        mifs.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
+        executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe
+        executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll
+        resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc)
+        mifs.sources += \
+            $$appResourceDir(demos/spectrum/app/spectrum.mif)
     }
 
     contains(QT_CONFIG, script) {
-        executables.sources += context2d.exe
-        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
-        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
-        mifs.sources += \
-            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.mif
+        executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe
+        reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)
+        resource.sources += $$appResourceDir(examples/script/context2d/context2d.rsc)
+        mifs.sources += \
+            $$appResourceDir(examples/script/context2d/context2d.mif)
+    }
+
+    qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
+    contains(QT_CONFIG, declarative) {
+        for(qmldemo, qmldemos) {
+            executables.sources += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe
+            reg_resource.sources += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)
+            resource.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)
+            mifs.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)
+        }
     }
 
@@ -227 +256 @@
         mifs desktopservices_music desktopservices_images fluidbackup
 
+
+
     DEPLOYMENT.installer_header = 0xA000D7CD
 

trunk/demos/embedded/fluidlauncher/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/demos/embedded/fluidlauncher/pictureflow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])