From 27cb7ac26ad4d71d613341572974c9be96a75630 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 26 May 2010 19:34:15 +0200
Subject: [PATCH] remove outdated qt version check
all of creator requires qt 4.7 now
---
share/qtcreator/translations/translations.pro | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index 0c7159690b0..a16da1983d0 100644
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -17,23 +17,19 @@ TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/qtcreator_,.ts)
MIME_TR_H = $$OUT_PWD/mime_tr.h
CUSTOMWIZARD_TR_H = $$OUT_PWD/customwizard_tr.h
-contains(QT_VERSION, ^4\.[0-6]\..*) {
- ts.commands = @echo This Qt version is too old for the ts target. Need Qt 4.7+.
-} else {
- for(dir, $$list($$files($$IDE_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml)
- MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\"
+for(dir, $$list($$files($$IDE_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml)
+MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\"
- for(dir, $$list($$files($$IDE_SOURCE_TREE/share/qtcreator/templates/wizards/*))):CUSTOMWIZARD_FILES += $$files($$dir/wizard.xml)
- CUSTOMWIZARD_FILES = \"$$join(CUSTOMWIZARD_FILES, \", \")\"
+for(dir, $$list($$files($$IDE_SOURCE_TREE/share/qtcreator/templates/wizards/*))):CUSTOMWIZARD_FILES += $$files($$dir/wizard.xml)
+CUSTOMWIZARD_FILES = \"$$join(CUSTOMWIZARD_FILES, \", \")\"
- QMAKE_SUBSTITUTES += extract-mimetypes.xq.in
- QMAKE_SUBSTITUTES += extract-customwizards.xq.in
- ts.commands += \
- $$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \
- $$XMLPATTERNS -output $$CUSTOMWIZARD_TR_H $$PWD/extract-customwizards.xq && \
- (cd $$IDE_SOURCE_TREE && $$LUPDATE src share/qtcreator/qmldesigner $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$TRANSLATIONS) && \
- $$QMAKE_DEL_FILE $$MIME_TR_H
-}
+QMAKE_SUBSTITUTES += extract-mimetypes.xq.in
+QMAKE_SUBSTITUTES += extract-customwizards.xq.in
+ts.commands += \
+ $$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \
+ $$XMLPATTERNS -output $$CUSTOMWIZARD_TR_H $$PWD/extract-customwizards.xq && \
+ (cd $$IDE_SOURCE_TREE && $$LUPDATE src share/qtcreator/qmldesigner $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$TRANSLATIONS) && \
+ $$QMAKE_DEL_FILE $$MIME_TR_H
QMAKE_EXTRA_TARGETS += ts
TEMPLATE = app
--
GitLab