Explorar o código

BUG: In Utilities/QtMobility, added patch specific to apple.

As specified here: http://doc.trolltech.com/4.3/qmake-platform-notes.html#mac-os-x

It resumes qmake is configured differently if build from the source (default to-spec macx-g++)
or distributed as a binary (default to -spec macx-xcode).

The patch make sure the option "-spec macx-g++" is passed to qmake.

Since the compileTest: QMF, NetworkManager and CoreWLAN were generating
warnings and these module doesn't seem to be required to compile
the serviceframework module, the patch will comment the corresponding lines.
Jean-Christophe Fillion-Robin %!s(int64=15) %!d(string=hai) anos
pai
achega
f2599820eb

+ 40 - 0
Utilities/QtMobility/QtMobilityBeta1-apple.patch

@@ -0,0 +1,40 @@
+*** ../qt-mobility-src-1.0.0-beta1/configure	2010-02-12 03:54:12.000000000 -0500
+--- configure	2010-03-24 18:51:06.000000000 -0400
+***************
+*** 364,372 ****
+  }
+  
+  #compile tests
+! compileTest QMF qmf
+! compileTest NetworkManager networkmanager
+! compileTest "CoreWLAN (MacOS 10.6)" corewlan
+  
+  # Now module selection
+  # using 'expr match ....' should help a bit
+--- 364,372 ----
+  }
+  
+  #compile tests
+! #compileTest QMF qmf
+! #compileTest NetworkManager networkmanager
+! #compileTest "CoreWLAN (MacOS 10.6)" corewlan
+  
+  # Now module selection
+  # using 'expr match ....' should help a bit
+***************
+*** 436,442 ****
+  mkdir -p "$shadowpath/features"
+  
+  echo "Running qmake..."
+! if qmake -recursive "$relpath/qtmobility.pro"; then
+      echo ""
+      echo "configure has finished. You may run make or gmake to build the project now."
+  else
+--- 436,442 ----
+  mkdir -p "$shadowpath/features"
+  
+  echo "Running qmake..."
+! if qmake -spec macx-g++ -recursive "$relpath/qtmobility.pro"; then
+      echo ""
+      echo "configure has finished. You may run make or gmake to build the project now."
+  else

+ 3 - 0
Utilities/QtMobility/QtMobilityBeta1-patch.cmake.in

@@ -22,6 +22,9 @@ IF(UNIX)
     ${configured_patch_dir}/QtMobilityBeta1-unix.patch @ONLY)
   LIST(APPEND patch_files
     ${configured_patch_dir}/QtMobilityBeta1-unix.patch)
+  IF(APPLE)
+    LIST(APPEND patch_files ${patch_dir}/QtMobilityBeta1-apple.patch)
+  ENDIF()
 ENDIF()
 
 # Apply patches