From e675ae7f7ba3ff5d525caef4c0ce8f098069f712 Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 23 Apr 2015 17:51:16 +1200 Subject: [PATCH] OP-1853 Ground build tidy: remove old qt stuff from translations.pro --- .../translations/translations.pro | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro b/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro index e428c3712..767ad3bb6 100644 --- a/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro +++ b/ground/openpilotgcs/share/openpilotgcs/translations/translations.pro @@ -22,17 +22,14 @@ TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/openpilotgcs_,.ts) MIME_TR_H = $$PWD/mime_tr.h -contains(QT_VERSION, ^4\\.[0-5]\\..*) { - ts.commands = @echo This Qt version is too old for the ts target. Need Qt 4.6+. -} else { - for(dir, $$list($$files($$GCS_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml) - MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\" - QMAKE_SUBSTITUTES += extract-mimetypes.xq.in - ts.commands += \ - $$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \ - (cd $$GCS_SOURCE_TREE && $$LUPDATE src $$MIME_TR_H -ts $$TRANSLATIONS) && \ - $$QMAKE_DEL_FILE $$targetPath($$MIME_TR_H) -} +for(dir, $$list($$files($$GCS_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml) +MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\" +QMAKE_SUBSTITUTES += extract-mimetypes.xq.in +ts.commands += \ + $$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \ + (cd $$GCS_SOURCE_TREE && $$LUPDATE src $$MIME_TR_H -ts $$TRANSLATIONS) && \ + $$QMAKE_DEL_FILE $$targetPath($$MIME_TR_H) + QMAKE_EXTRA_TARGETS += ts TEMPLATE = app