feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

prune some more qt4 vestiges from project files

Browse Source 
Change-Id: Ic71e1b4f10b08274d109c24c7c9de7724b25962b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen
2014-12-18 14:35:30 +01:00
parent 4243c24754
commit 32b8e71bb7
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/static.pro
View File

@@ -45,7 +45,6 @@ macx: DATA_DIRS += scripts
for(data_dir, DATA_DIRS) { for(data_dir, DATA_DIRS) {
files = $$files($$PWD/$$data_dir/*, true) files = $$files($$PWD/$$data_dir/*, true)
win32:files ~= s|\\\\|/|g
# Info.plist.in are handled below # Info.plist.in are handled below
for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file
} }

1
share/qtcreator/translations/translations.pro
View File

@@ -51,7 +51,6 @@ extract.commands += \
QMAKE_EXTRA_TARGETS += extract QMAKE_EXTRA_TARGETS += extract
plugin_sources = $$files($$IDE_SOURCE_TREE/src/plugins/*) 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 ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g$$i_flag
plugin_sources -= src/plugins/plugins.pro \ plugin_sources -= src/plugins/plugins.pro \
src/plugins/helloworld \ # just an example src/plugins/helloworld \ # just an example

2
src/plugins/clangcodemodel/clang_installation.pri
View File

@@ -1,5 +1,5 @@
isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) 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_COMPLETION
DEFINES += CLANG_HIGHLIGHTING DEFINES += CLANG_HIGHLIGHTING