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 | 16 |
1 files changed, 8 insertions, 8 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 102d19c..1bccbb3 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 d35548631229f954fc44b757dc21922ec47ea919 Mon Sep 17 00:00:00 2001 +From 97b39621db5e79a1bd2300f61f93a7ff94fbf054 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <[email protected]> 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 8c2c185..66464fa 100755 +index a5fd3e1..bfcec93 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8300,10 +8300,10 @@ else +@@ -8265,10 +8265,10 @@ else ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" done fi @@ -27,7 +27,7 @@ index 8c2c185..66464fa 100755 QTCONFIG="$outpath/mkspecs/qconfig.pri" QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -@@ -8403,23 +8403,19 @@ else +@@ -8368,23 +8368,19 @@ else fi #------------------------------------------------------------------------------- @@ -55,7 +55,7 @@ index 8c2c185..66464fa 100755 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -@@ -8429,65 +8425,86 @@ EOF +@@ -8394,65 +8390,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 c6819db..46f1a87 100644 +index b74d610..5ec4cd6 100644 --- a/qtbase/tools/configure/configureapp.cpp +++ b/qtbase/tools/configure/configureapp.cpp -@@ -2911,63 +2911,101 @@ void Configure::generateCachefile() +@@ -2913,63 +2913,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 c6819db..46f1a87 100644 configStream << "CONFIG+= "; configStream << dictionary[ "BUILD" ]; if (dictionary[ "SHARED" ] == "yes") -@@ -3027,26 +3065,6 @@ void Configure::generateCachefile() +@@ -3029,26 +3067,6 @@ void Configure::generateCachefile() << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; |