Преглед на файлове

BUG: QtMobility: enhanced Windows patch file (tested on Windows 7 with MinGW)

- Added an option to build shared libraries on windows
- Added a trailing slash to the QT_PATH variable
Sascha Zelzer преди 15 години
родител
ревизия
37b5ab86fd
променени са 1 файла, в които са добавени 15 реда и са изтрити 1 реда
  1. 15 1
      Utilities/QtMobility/QtMobilityBeta1-win32.patch.in

+ 15 - 1
Utilities/QtMobility/QtMobilityBeta1-win32.patch.in

@@ -1,3 +1,17 @@
+diff -crB ../qt-mobility-src-1.0.0-beta1/common.pri common.pri
+*** ./qt-mobility-src-1.0.0-beta1/common.pri	2010-02-12 03:54:11.000000000 -0500
+--- common.pri	2010-03-11 16:04:39.000000000 -0500
+***************
+*** 104,109 ****
+--- 104,111 ----
+      QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+  }
+  
++ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
++ 
+  maemo6 {
+      DEFINES+= Q_WS_MAEMO_6
+  }
 diff -crB ../qt-mobility-src-1.0.0-beta1/configure.bat configure.bat
 *** ./qt-mobility-src-1.0.0-beta1/configure.bat	2010-02-12 03:54:12.000000000 -0500
 --- configure.bat	2010-03-18 13:19:42.000000000 -0400
@@ -14,7 +28,7 @@ diff -crB ../qt-mobility-src-1.0.0-beta1/configure.bat configure.bat
   set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
   set MOBILITY_MODULES_UNPARSED=
   set VC_TEMPLATE_OPTION=
-! set QT_PATH=@QT_BINARY_DIR@
+! set QT_PATH=@QT_BINARY_DIR@/
   set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
   
   if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%