Changeset 769 for trunk/demos/embedded/fluidlauncher

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 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/fluidlauncher.pro (modified) (3 diffs)
• demos/embedded/fluidlauncher/screenshots/spectrum.png (copied) (copied from branches/vendor/nokia/qt/4.6.3/demos/embedded/fluidlauncher/screenshots/spectrum.png )

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

@@ -21 +21 @@
     <example filename="digiflip" name="Flipping Clock" image="screenshots/digiflip.png"/>
     <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png" args="-small-screen"/>
+
   </demos>
   <slideshow timeout="60000" interval="10000">

trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

@@ -98 +98 @@
     contains(QT_CONFIG, phonon) {
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
+
+
+
+
     }
 
@@ -165 +169 @@
             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
 
-        # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
-        executables.pkg_prerules += \
-            "; Dependency to Qt Webkit" \
-            "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+        isEmpty(QT_LIBINFIX) {
+            # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
+            executables.pkg_prerules += \
+                "; Dependency to Qt Webkit" \
+                "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+        }
     }
 
@@ -176 +182 @@
         mifs.sources += \
             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
+
+
+
+
+
+
+
     }