rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix/respin qdevice_pri patch

Browse Source
This commit is contained in:
Rex Dieter 2012-10-23 16:11:37 -05:00
parent 0e56548e70
commit 22ea7613bd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
View File

@ -5,7 +5,7 @@ diff -up qt-everywhere-opensource-src-4.8.3/mkspecs/features/device_config.prf.q
# Load generated qdevice.pri # Load generated qdevice.pri
isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) 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 = . # where to get?
+isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $[[QT_INSTALL_DATA]. +isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA]
DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri

5
qt.spec
View File

@ -16,7 +16,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.3 Version: 4.8.3
Release: 5%{?dist} Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # 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 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -1105,6 +1105,9 @@ fi
%changelog %changelog
* Tue Oct 23 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.3-6
- fix/respin qdevice_pri patch
* Mon Oct 22 2012 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.3-5 * Mon Oct 22 2012 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.3-5
- QDir::homePath() should account for an empty $HOME (QTBUG-4862, kde#249217, #694385) - QDir::homePath() should account for an empty $HOME (QTBUG-4862, kde#249217, #694385)