[meego-commits] 23585: Changes to Trunk:Testing/qt-mobility

[Markus Lehtonen]

Hi,
I have made the following changes to qt-mobility in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Markus Lehtonen

[This message was auto-generated]

---

Request #23585:

  submit:   devel:qt-mtf/qt-mobility(r186) -> Trunk:Testing/qt-mobility


Message:
    * Thu Aug 04 2011 Markus Lehtonen <markus.lehtonen at linux.intel.com> - 1.2.0
- Fix compilation with Qt4.8 (add sync-declarative-to-qt48-qobject patch and
  sync-macros-to-qt48 patch)

State:   new          2011-08-04T07:53:07 mlehtonen
Comment: None



changes files:
--------------
--- qt-mobility.changes
+++ qt-mobility.changes
@@ -0,0 +1,4 @@
+* Thu Aug 04 2011 Markus Lehtonen <markus.lehtonen at linux.intel.com> - 1.2.0
+- Fix compilation with Qt4.8 (add sync-declarative-to-qt48-qobject patch and
+  sync-macros-to-qt48 patch)
+

new:
----
  sync-declarative-to-qt48-qobject.patch
  sync-macros-to-qt48.patch

spec files:
-----------
--- qt-mobility.spec
+++ qt-mobility.spec
@@ -43,6 +43,8 @@
 Patch15:     versit_urls_changed_to_uris.patch
 Patch16:     no-accel-crash-fix.patch
 Patch17:     contacts_use_eds_engine.patch
+Patch18:     sync-declarative-to-qt48-qobject.patch
+Patch19:     sync-macros-to-qt48.patch
 Requires:   libqtconnectivity1 = %{version}
 Requires:   libqtcontacts1 = %{version}
 Requires:   libqtfeedback1 = %{version}
@@ -540,6 +542,10 @@
 %patch16 -p1
 # contacts_use_eds_engine.patch
 %patch17 -p1
+# sync-declarative-to-qt48-qobject.patch
+%patch18 -p1
+# sync-macros-to-qt48.patch
+%patch19 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ qt-mobility.yaml
--- qt-mobility.yaml
+++ qt-mobility.yaml
@@ -29,6 +29,8 @@
     - versit_urls_changed_to_uris.patch
     - no-accel-crash-fix.patch
     - contacts_use_eds_engine.patch
+    - sync-declarative-to-qt48-qobject.patch
+    - sync-macros-to-qt48.patch
 Description: |
     Qt Mobility delivers a set of new APIs for mobile device functionality. These
     APIs allow the developer to use these features with ease from one framework and

++++++ sync-declarative-to-qt48-qobject.patch (new)
--- sync-declarative-to-qt48-qobject.patch
+++ sync-declarative-to-qt48-qobject.patch
+Index: qt-mobility-opensource-src-1.2.0/src/serviceframework/ipc/qmetaobjectbuilder_p.h
+===================================================================
+--- qt-mobility-opensource-src-1.2.0.orig/src/serviceframework/ipc/qmetaobjectbuilder_p.h
++++ qt-mobility-opensource-src-1.2.0/src/serviceframework/ipc/qmetaobjectbuilder_p.h
+@@ -172,7 +172,7 @@ public:
+     int indexOfEnumerator(const QByteArray& name);
+     int indexOfClassInfo(const QByteArray& name);
+ 
+-    typedef int (*StaticMetacallFunction)(QMetaObject::Call, int, void **);
++    typedef QMetaObjectExtraData::StaticMetacallFunction StaticMetacallFunction;
+ 
+     QMetaObjectBuilder::StaticMetacallFunction staticMetacallFunction() const;
+     void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value);

++++++ sync-macros-to-qt48.patch (new)
--- sync-macros-to-qt48.patch
+++ sync-macros-to-qt48.patch
+Index: qt-mobility-opensource-src-1.2.0/src/messaging/qmessageglobal.h
+===================================================================
+--- qt-mobility-opensource-src-1.2.0.orig/src/messaging/qmessageglobal.h
++++ qt-mobility-opensource-src-1.2.0/src/messaging/qmessageglobal.h
+@@ -59,7 +59,8 @@
+     }
+ #  else
+ #  define Q_SCOPED_STATIC_DEFINE(TYPE, SCOPE, NAME)                     \
+-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \
++    static QGlobalStatic<TYPE > this_##NAME                             \
++                = { Q_BASIC_ATOMIC_INITIALIZER(0), false };             \
+     TYPE *SCOPE::NAME()                                                 \
+     {                                                                   \
+         if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
+Index: qt-mobility-opensource-src-1.2.0/src/bearer/qnetworkconfigmanager.cpp
+===================================================================
+--- qt-mobility-opensource-src-1.2.0.orig/src/bearer/qnetworkconfigmanager.cpp
++++ qt-mobility-opensource-src-1.2.0/src/bearer/qnetworkconfigmanager.cpp
+@@ -76,7 +76,8 @@ QTM_BEGIN_NAMESPACE
+     }
+ #else
+ #define Q_GLOBAL_STATIC_QAPP_DESTRUCTION(TYPE, NAME)                    \
+-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \
++    static QGlobalStatic<TYPE > this_##NAME                             \
++                = { Q_BASIC_ATOMIC_INITIALIZER(0), false };             \
+     static void NAME##_cleanup()                                        \
+     {                                                                   \
+         delete this_##NAME.pointer;                                     \