[mingw-qt5-qtbase] Fix references to the tools qdoc and qhelpgenerator (needed to build qtdoc)
Erik van Pienbroek
epienbro at fedoraproject.org
Fri May 10 17:37:42 UTC 2013
commit 859a190110b131f0de29659ee534009267039d7a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri May 10 19:37:41 2013 +0200
Fix references to the tools qdoc and qhelpgenerator (needed to build qtdoc)
mingw-qt5-qtbase.spec | 5 ++++-
qmake.conf.win32 | 2 ++
qmake.conf.win64 | 2 ++
3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 2c7c966..e49b8f3 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -20,7 +20,7 @@
Name: mingw-qt5-qtbase
Version: 5.0.2
-Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
Summary: Qt5 for Windows - QtBase component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -692,6 +692,9 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
%changelog
+* Fri May 10 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.2-2
+- Fix references to the tools qdoc and qhelpgenerator (needed to build qtdoc)
+
* Sat Apr 13 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.2-1
- Update to 5.0.2
- Remove DirectWrite support for now as the necessary API
diff --git a/qmake.conf.win32 b/qmake.conf.win32
index 9dcd794..afc528d 100644
--- a/qmake.conf.win32
+++ b/qmake.conf.win32
@@ -102,6 +102,8 @@ PKG_CONFIG = i686-w64-mingw32-pkg-config
#QT_TOOL.uic.command = i686-w64-mingw32-uic-qt5
#QT_TOOL.rcc.command = i686-w64-mingw32-rcc-qt5
#QT_TOOL.syncqt.command = i686-w64-mingw32-syncqt-qt5
+QT_TOOL.qdoc.command = i686-w64-mingw32-qdoc-qt5
+QT_TOOL.qhelpgenerator.command = i686-w64-mingw32-qhelpgenerator-qt5
QT_TOOL.lrelease.command = i686-w64-mingw32-lrelease-qt5
QMAKE_LRELEASE = i686-w64-mingw32-lrelease-qt5
diff --git a/qmake.conf.win64 b/qmake.conf.win64
index b8c3492..2f375b0 100644
--- a/qmake.conf.win64
+++ b/qmake.conf.win64
@@ -102,6 +102,8 @@ PKG_CONFIG = x86_64-w64-mingw32-pkg-config
#QT_TOOL.uic.command = x86_64-w64-mingw32-uic-qt5
#QT_TOOL.rcc.command = x86_64-w64-mingw32-rcc-qt5
#QT_TOOL.syncqt.command = x86_64-w64-mingw32-syncqt-qt5
+QT_TOOL.qdoc.command = x86_64-mingw32-qdoc-qt5
+QT_TOOL.qhelpgenerator.command = x86_64-w64-mingw32-qhelpgenerator-qt5
QT_TOOL.lrelease.command = x86_64-w64-mingw32-lrelease-qt5
QMAKE_LRELEASE = x86_64-w64-mingw32-lrelease-qt5
More information about the scm-commits
mailing list