packaging/harmattan-qt4-c++11.patch

   1 C++11 imposes stricter requirements on string concatenations due to the way how
   2 the user-defined literal suffixes work.
   3
   4 Turns out that the Qt repo contains this already, but not the Harmattan version --
   5 see commits 91bf025444f13eb269ece6bb430a841638bb32a8 and
   6 6d9bdc5038644ccef2eb2da3cd46522de5904974.
   7
   8 Also fix a build warning, see qt4.git's 0e595ad22db04141bfbd6093824cdcc775fd371d
   9
  10 diff -Naurt include.orig/qt4/QtCore/qobjectdefs.h include/qt4/QtCore/qobjectdefs.h
  11 --- include.orig/qt4/QtCore/qobjectdefs.h       2013-08-31 00:02:54.240896132 +0200
  12 +++ include/qt4/QtCore/qobjectdefs.h    2013-08-31 00:03:08.150053167 +0200
  13 @@ -216,7 +216,7 @@
  14  #define QTOSTRING_HELPER(s) #s
  15  #define QTOSTRING(s) QTOSTRING_HELPER(s)
  16  #ifndef QT_NO_DEBUG
  17 -# define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__)
  18 +# define QLOCATION "\0" __FILE__ ":" QTOSTRING(__LINE__)
  19  # define METHOD(a)   qFlagLocation("0"#a QLOCATION)
  20  # define SLOT(a)     qFlagLocation("1"#a QLOCATION)
  21  # define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)
  22 diff -Naurt include.orig/qt4/QtCore/qplugin.h include/qt4/QtCore/qplugin.h
  23 --- include.orig/qt4/QtCore/qplugin.h   2012-01-11 16:19:31.880151593 +0100
  24 +++ include/qt4/QtCore/qplugin.h        2013-08-31 00:05:34.613694064 +0200
  25 @@ -112,9 +112,9 @@
  26  #  define Q_PLUGIN_VERIFICATION_DATA \
  27      static const char qt_plugin_verification_data[] = \
  28        "pattern=""QT_PLUGIN_VERIFICATION_DATA""\n" \
  29 -      "version="QT_VERSION_STR"\n" \
  30 -      "debug="QPLUGIN_DEBUG_STR"\n" \
  31 -      "buildkey="QT_BUILD_KEY;
  32 +      "version=" QT_VERSION_STR "\n" \
  33 +      "debug=" QPLUGIN_DEBUG_STR "\n" \
  34 +      "buildkey=" QT_BUILD_KEY;
  35
  36  #  if defined (Q_OS_WIN32) && defined(Q_CC_BOR)
  37  #     define Q_STANDARD_CALL __stdcall
  38 diff -Naurt include.orig/qt4/QtCore/qsharedpointer_impl.h include/qt4/QtCore/qsharedpointer_impl.h
  39 --- include.orig/qt4/QtCore/qsharedpointer_impl.h       2012-01-11 16:19:31.862151592 +0100
  40 +++ include/qt4/QtCore/qsharedpointer_impl.h    2013-08-31 10:56:15.184452104 +0200
  41 @@ -580,7 +580,7 @@
  42  #ifndef QT_NO_QOBJECT
  43      // special constructor that is enabled only if X derives from QObject
  44      template <class X>
  45 -    inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
  46 +    inline QWeakPointer(X *ptr) : d(ptr ? Data::getAndRef(ptr) : 0), value(ptr)
  47      { }
  48  #endif
  49      template <class X>