Changeset 769 for trunk/src/gui/s60framework

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)
• src/gui/s60framework/qs60mainapplication.cpp (modified) (3 diffs)
• src/gui/s60framework/qs60mainappui.cpp (modified) (3 diffs)
• src/gui/s60framework/qs60maindocument.h (modified) (1 diff)
• src/gui/s60framework/s60framework.pri (modified) (2 diffs)

trunk/src/gui/s60framework/qs60mainapplication.cpp

@@ -42 +42 @@
 // INCLUDE FILES
 #include <exception>
+
 #include "qs60maindocument.h"
 #include "qs60mainapplication_p.h"
@@ -58 +59 @@
 }
 
-_LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
+_LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
 
 /*!
@@ -64 +65 @@
   \since 4.6
   \brief The QS60MainApplication class provides support for migration from S60.
- 
+
   \warning This class is provided only to get access to S60 specific
   functionality in the application framework classes. It is not
   portable. We strongly recommend against using it in new applications.
- 
+
   The QS60MainApplication provides a helper class for use in migrating
   from existing S60 based applications to Qt based applications. It is

trunk/src/gui/s60framework/qs60mainappui.cpp

@@ -46 +46 @@
 #include <eikmenup.h>
 #include <barsread.h>
-#include <s60main.rsg>
+#include <qconfig.h>
+#if defined(QT_LIBINFIX_UNQUOTED)
+// Two level macro needed for proper expansion of libinfix
+#  define QT_S60MAIN_RSG_2(x) <s60main##x##.rsg>
+#  define QT_S60MAIN_RSG(x) QT_S60MAIN_RSG_2(x)
+#  include QT_S60MAIN_RSG(QT_LIBINFIX_UNQUOTED)
+#else
+#  include <s60main.rsg>
+#endif
 #include <avkon.rsg>
 
@@ -57 +65 @@
 #include <qdebug.h>
 
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -105 +116 @@
     // resource files in most SDKs. S60 3rd FP1 public seems to require resource file
     // even these flags are defined
-    TInt flags = CAknAppUi::EAknEnableSkin;
-    if (QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)) {
-        flags |= CAknAppUi::ENoScreenFurniture | CAknAppUi::ENonStandardResourceFile;
-    }
+    TInt flags = CAknAppUi::EAknEnableSkin
+                 | CAknAppUi::ENoScreenFurniture
+                 | CAknAppUi::ENonStandardResourceFile;
+    // After 5th Edition S60, native side supports animated wallpapers.
+        // However, there is no support for that feature on Qt side, so indicate to
+        // native UI framework that this application will not support background animations.
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)
+        flags |= KAknDisableAnimationBackground;
     BaseConstructL(flags);
-
-    if (!QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)) {
-        CEikButtonGroupContainer* nativeContainer = Cba();
-        nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
-    }
 }
 

trunk/src/gui/s60framework/qs60maindocument.h

@@ -47 +47 @@
 #ifdef Q_WS_S60
 
-#include <akndoc.h>
+#include <oc.h>
 
 class CEikApplication;

trunk/src/gui/s60framework/s60framework.pri

@@ -5 +5 @@
     "SOURCEPATH s60framework" \
     "START RESOURCE s60main.rss" \
+
     "HEADER" \
-    "TARGETPATH resource\apps" \
+    "TARGETPATH apps" \
     "END"
 MMP_RULES += minimalAppResource31
@@ -18 +19 @@
            s60framework/qs60mainappui.h \
            s60framework/qs60maindocument.h
+
+