diff options
| author | axis <[email protected]> | 2011-04-27 13:01:17 +0200 |
|---|---|---|
| committer | axis <[email protected]> | 2011-04-27 13:01:17 +0200 |
| commit | 1a0d5aeb9197ea0c3432903c402d8449bea9f6b4 (patch) | |
| tree | 3fbb60e2a0bff38c9cabfb1b5d347579e8769f93 /patches/0003-Expose-source-and-build-directories-for-QtBase.patch | |
| parent | 2f66cb61ffbf147292092ebe29e3d4759dfb9bda (diff) | |
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 | 12 |
1 files changed, 6 insertions, 6 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..e43485b 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 d6231ac51dd8642c663e88835099d1f5432a70bc 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 5e3e40f..f2ee5f4 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8300,10 +8300,10 @@ else +@@ -8299,10 +8299,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 +@@ -8402,23 +8402,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 +@@ -8428,65 +8424,86 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then @@ -339,5 +339,5 @@ index c6819db..46f1a87 100644 configFile.close(); } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 |