diff options
Diffstat (limited to 'patches/0003-Expose-source-and-build-directories-for-QtBase.patch')
| -rw-r--r-- | patches/0003-Expose-source-and-build-directories-for-QtBase.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch index 16de851..102d19c 100644 --- a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch +++ b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch @@ -1,4 +1,4 @@ -From 5297976a140beabcb731129a816d5720f92dfb8e Mon Sep 17 00:00:00 2001 +From d35548631229f954fc44b757dc21922ec47ea919 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 11 Nov 2010 09:35:09 -0600 Subject: [PATCH] Expose source and build directories for QtBase @@ -12,10 +12,10 @@ Also expose moc, uic, rcc, qdbusxml2cpp, include and lib create mode 100644 qtbase/mkspecs/features/qt_module.prf diff --git a/qtbase/configure b/qtbase/configure -index 5238c34..1fc14e2 100755 +index 8c2c185..66464fa 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8254,10 +8254,10 @@ else +@@ -8300,10 +8300,10 @@ else ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" done fi @@ -27,7 +27,7 @@ index 5238c34..1fc14e2 100755 QTCONFIG="$outpath/mkspecs/qconfig.pri" QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -@@ -8352,23 +8352,19 @@ else +@@ -8403,23 +8403,19 @@ else fi #------------------------------------------------------------------------------- @@ -55,7 +55,7 @@ index 5238c34..1fc14e2 100755 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -@@ -8378,65 +8374,86 @@ EOF +@@ -8429,65 +8425,86 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then @@ -182,10 +182,10 @@ index 0000000..9fe20c7 + debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") +} diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp -index b74d610..5ec4cd6 100644 +index c6819db..46f1a87 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp -@@ -2913,63 +2913,101 @@ void Configure::generateCachefile() +@@ -2911,63 +2911,101 @@ void Configure::generateCachefile() QFile cacheFile(buildPath + "/.qmake.cache"); if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream cacheStream(&cacheFile); @@ -311,7 +311,7 @@ index b74d610..5ec4cd6 100644 configStream << "CONFIG+= "; configStream << dictionary[ "BUILD" ]; if (dictionary[ "SHARED" ] == "yes") -@@ -3029,26 +3067,6 @@ void Configure::generateCachefile() +@@ -3027,26 +3065,6 @@ void Configure::generateCachefile() << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; @@ -339,5 +339,5 @@ index b74d610..5ec4cd6 100644 configFile.close(); } -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |