Changeset 651 for trunk/demos/embedded/fluidlauncher

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/embedded/fluidlauncher/backup_registration.xml (copied) (copied from branches/vendor/nokia/qt/4.6.2/demos/embedded/fluidlauncher/backup_registration.xml )
• demos/embedded/fluidlauncher/demoapplication.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/demoapplication.h (modified) (1 diff)
• demos/embedded/fluidlauncher/fluidlauncher.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/fluidlauncher.h (modified) (1 diff)
• demos/embedded/fluidlauncher/fluidlauncher.pro (modified) (1 diff)
• demos/embedded/fluidlauncher/main.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/pictureflow.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/pictureflow.h (modified) (1 diff)
• demos/embedded/fluidlauncher/slideshow.cpp (modified) (1 diff)
• demos/embedded/fluidlauncher/slideshow.h (modified) (1 diff)

trunk/demos/embedded/fluidlauncher/demoapplication.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/demoapplication.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/fluidlauncher.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/fluidlauncher.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

@@ -208 +208 @@
     saxbookmarks.path = /data/qt/saxbookmarks
 
+    fluidbackup.sources = backup_registration.xml
+    fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,)
+
     DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \
-        mifs desktopservices_music desktopservices_images
+        mifs desktopservices_music desktopservices_images fluidbackup
+
+    DEPLOYMENT.installer_header = 0xA000D7CD
 
     TARGET.EPOCHEAPSIZE = 100000 20000000

trunk/demos/embedded/fluidlauncher/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/pictureflow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/pictureflow.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/slideshow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/embedded/fluidlauncher/slideshow.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)