[qt] find qdevice.pri even for installed qt builds

[Rex Dieter]

commit 5fadc9d45734b5d4cb3c7a5137c2daca0042df7b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 28 09:10:11 2012 -0500

    find qdevice.pri even for installed qt builds

 ...erywhere-opensource-src-4.8.3-qdevice_pri.patch |   11 +++++++++++
 qt.spec                                            |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch b/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
new file mode 100644
index 0000000..72ae7f4
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
@@ -0,0 +1,11 @@
+diff -up qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf.qmake_fix qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf
+--- qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf.qmake_fix	2012-09-10 20:36:35.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf	2012-09-28 09:06:48.732819678 -0500
+@@ -1,6 +1,6 @@
+ # Load generated qdevice.pri
+ isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
+-isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = . # where to get?
++isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $[[QT_INSTALL_DATA].
+ 
+ DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri
+ 
diff --git a/qt.spec b/qt.spec
index 19d2d29..0d97be0 100644
--- a/qt.spec
+++ b/qt.spec
@@ -16,7 +16,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -113,6 +113,9 @@ Patch81: ./qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
 # upstream patches
 # http://codereview.qt-project.org/#change,22006
 Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
+# find qdevice.pri even for installed qt builds
+# https://codereview.qt-project.org/#change,34507
+Patch101: qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
 # fix JIT crash
 # https://bugreports.qt-project.org/browse/QTBUG-23871
 # https://bugs.kde.org/show_bug.cgi?id=297661
@@ -456,6 +459,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 
 # upstream patches
 %patch100 -p1 -b .QTgaHandler
+%patch101 -p1 -b .qdevice_pri
 ## 4.8.3 includes this patch, revert it to avoid regressions for now -- rex
 %patch103 -p1 -R -b .QtScript_JIT
 
@@ -1090,6 +1094,9 @@ fi
 
 
 %changelog
+* Fri Sep 28 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-3
+- find qdevice.pri even for installed qt builds
+
 * Thu Sep 27 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-2
 - upstream disable-SSL-compression patch