summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-06-10 12:35:03 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-10 12:35:03 (GMT)
commit0d5649713af91dcce58a623bbef7d38e2fbdf13b (patch)
tree4790deef3f2d8a810f3e98751c3cd119fde8c993 /doc/doc.pri
parent1fc149fdc32e12043c9c2676e2a381e225886dbf (diff)
downloadQt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.zip
Qt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.tar.gz
Qt-0d5649713af91dcce58a623bbef7d38e2fbdf13b.tar.bz2
use "win32-g++*" scope to match all MinGW makespecs
The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'doc/doc.pri')
-rw-r--r--doc/doc.pri6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 0a5cc9a..f748f3d 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -5,9 +5,9 @@
DOCS_GENERATION_DEFINES =
GENERATOR = $$QT_BUILD_TREE/bin/qhelpgenerator
-win32:!win32-g++ {
+win32:!win32-g++* {
unixstyle = false
-} else :win32-g++:isEmpty(QMAKE_SH) {
+} else :win32-g++*:isEmpty(QMAKE_SH) {
unixstyle = false
} else {
unixstyle = true
@@ -41,7 +41,7 @@ QT_JA_JP_DOCUMENTATION = ($$QDOC qt-api-only_ja_JP.qdocconf) && \
$$GENERATOR doc-build/html-qt_ja_JP/qt.qhp -o doc/qch/qt_ja_JP.qch \
)
-win32-g++:isEmpty(QMAKE_SH) {
+win32-g++*:isEmpty(QMAKE_SH) {
QT_DOCUMENTATION = $$replace(QT_DOCUMENTATION, "/", "\\\\")
QT_ZH_CN_DOCUMENTATION = $$replace(QT_ZH_CN_DOCUMENTATION, "/", "\\\\")
QT_JA_JP_DOCUMENTATION = $$replace(QT_JA_JP_DOCUMENTATION, "/", "\\\\")