From fbef612ede06fe0d55841fa49ed04280d1464c3f Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Fri, 19 Dec 2014 11:29:58 +0100 Subject: [PATCH] Fix "nmake ts-de" on Windows. Local filenames should have the "file:///" prefix when passing them on to the XQuery (if there is no host). On Linux this worked without the prefix, while on windows QUrl got confused by the colon (interpreted as the host:port separator). For Unix filesystems, they will get their third slash from the first slash in the absolute filename (when appended to the file:// prefix) Change-Id: I41abed4821f1f253a13cc829eed8cb38e8e77bdc Task-number: QTBUG-43417 Reviewed-by: Oswald Buddenhagen --- share/qtcreator/translations/translations.pro | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index 4892af5f7ec..f3ce85cc7a7 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -26,20 +26,25 @@ QMLWIZARD_TR_H = $$OUT_PWD/qmlwizard_tr.h QTQUICKWIZARD_TR_H = $$OUT_PWD/qtquickwizard_tr.h EXTERNALTOOLS_TR_H = $$OUT_PWD/externaltools_tr.h +win32: \ + PREFIX = "file:///" +else: \ + PREFIX = "file://" + for(dir, $$list($$files($$IDE_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml) -MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, |)\" +MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, "|$$PREFIX", "$$PREFIX")\" for(dir, $$list($$files($$IDE_SOURCE_TREE/share/qtcreator/templates/wizards/*, true))):CUSTOMWIZARD_FILES += $$files($$dir/wizard.xml) -CUSTOMWIZARD_FILES = \"$$join(CUSTOMWIZARD_FILES, |)\" +CUSTOMWIZARD_FILES = \"$$join(CUSTOMWIZARD_FILES, "|$$PREFIX", "$$PREFIX")\" for(dir, $$list($$files($$IDE_SOURCE_TREE/share/qtcreator/templates/qml/*))):QMLWIZARD_FILES += $$files($$dir/template.xml) -QMLWIZARD_FILES = \"$$join(QMLWIZARD_FILES, |)\" +QMLWIZARD_FILES = \"$$join(QMLWIZARD_FILES, "|$$PREFIX", "$$PREFIX")\" for(dir, $$list($$files($$IDE_SOURCE_TREE/share/qtcreator/templates/qtquick/*))):QTQUICKWIZARD_FILES += $$files($$dir/template.xml) -QTQUICKWIZARD_FILES = \"$$join(QTQUICKWIZARD_FILES, |)\" +QTQUICKWIZARD_FILES = \"$$join(QTQUICKWIZARD_FILES, "|$$PREFIX", "$$PREFIX")\" for(file, $$list($$files($$IDE_SOURCE_TREE/src/share/qtcreator/externaltools/*))):EXTERNALTOOLS_FILES += $$files($$file) -EXTERNALTOOLS_FILES = \"$$join(EXTERNALTOOLS_FILES, |)\" +EXTERNALTOOLS_FILES = \"$$join(EXTERNALTOOLS_FILES, "|$$PREFIX", "$$PREFIX")\" extract.commands += \ $$XMLPATTERNS -output $$MIME_TR_H -param files=$$MIMETYPES_FILES $$PWD/extract-mimetypes.xq $$escape_expand(\\n\\t) \