From 32b8e71bb775f621bf4d132d86ecb077e8d04d10 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 18 Dec 2014 14:35:30 +0100 Subject: [PATCH] prune some more qt4 vestiges from project files Change-Id: Ic71e1b4f10b08274d109c24c7c9de7724b25962b Reviewed-by: Eike Ziller Reviewed-by: Oswald Buddenhagen --- share/qtcreator/static.pro | 1 - share/qtcreator/translations/translations.pro | 1 - src/plugins/clangcodemodel/clang_installation.pri | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 360fbf39cb7..66af1198f0a 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -45,7 +45,6 @@ macx: DATA_DIRS += scripts for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g # Info.plist.in are handled below for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file } diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index 8afeaf67493..ed8cc97062d 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -51,7 +51,6 @@ extract.commands += \ QMAKE_EXTRA_TARGETS += extract plugin_sources = $$files($$IDE_SOURCE_TREE/src/plugins/*) -win32:plugin_sources ~= s,\\\\,/,g plugin_sources ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g$$i_flag plugin_sources -= src/plugins/plugins.pro \ src/plugins/helloworld \ # just an example diff --git a/src/plugins/clangcodemodel/clang_installation.pri b/src/plugins/clangcodemodel/clang_installation.pri index 584e844caeb..079b00ebc1d 100644 --- a/src/plugins/clangcodemodel/clang_installation.pri +++ b/src/plugins/clangcodemodel/clang_installation.pri @@ -1,5 +1,5 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) -LLVM_INSTALL_DIR ~= s,\\\\,/,g +LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR) DEFINES += CLANG_COMPLETION DEFINES += CLANG_HIGHLIGHTING