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

Fix qmake warning

Browse Source 
"src/shared/syntax/syntax_shared.pri:6: exists(file) requires one
argument."

Change-Id: Ia4151228a05cc3777d38b52bf4811647c17f4f18
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2019-03-06 10:00:14 +01:00
parent 7cfc18276f
commit 177bebabea
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/texteditor_dependencies.pri
View File

@@ -9,7 +9,7 @@ QTC_PLUGIN_DEPENDS += \
# needed for plugins that depend on TextEditor plugin # needed for plugins that depend on TextEditor plugin
include(../../shared/syntax/syntax_shared.pri) include(../../shared/syntax/syntax_shared.pri)
!isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR) { !isEmpty(KSYNTAXHIGHLIGHTING_LIB_DIR):!isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR) {
INCLUDEPATH *= $${KSYNTAXHIGHLIGHTING_INCLUDE_DIR} INCLUDEPATH *= $${KSYNTAXHIGHLIGHTING_INCLUDE_DIR}
LIBS *= -L$$KSYNTAXHIGHLIGHTING_LIB_DIR -lKF5SyntaxHighlighting LIBS *= -L$$KSYNTAXHIGHLIGHTING_LIB_DIR -lKF5SyntaxHighlighting

24
src/shared/syntax/syntax_shared.pri
View File

@@ -3,17 +3,19 @@
isEmpty(KSYNTAXHIGHLIGHTING_LIB_DIR): KSYNTAXHIGHLIGHTING_LIB_DIR=$$(KSYNTAXHIGHLIGHTING_LIB_DIR) isEmpty(KSYNTAXHIGHLIGHTING_LIB_DIR): KSYNTAXHIGHLIGHTING_LIB_DIR=$$(KSYNTAXHIGHLIGHTING_LIB_DIR)
isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR): KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$(KSYNTAXHIGHLIGHTING_INCLUDE_DIR) isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR): KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$(KSYNTAXHIGHLIGHTING_INCLUDE_DIR)
!exists($$KSYNTAXHIGHLIGHTING_LIB_DIR) { !isEmpty(KSYNTAXHIGHLIGHTING_LIB_DIR) {
unset(KSYNTAXHIGHLIGHTING_LIB_DIR) !exists($$KSYNTAXHIGHLIGHTING_LIB_DIR) {
unset(KSYNTAXHIGHLIGHTING_INCLUDE_DIR)
} else {
isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR) {
!linux: KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$absolute_path('../include/KF5/KSyntaxHighlighting/', $$KSYNTAXHIGHLIGHTING_LIB_DIR)
else: KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$absolute_path('../../include/KF5/KSyntaxHighlighting/', $$KSYNTAXHIGHLIGHTING_LIB_DIR)
}
!exists($$KSYNTAXHIGHLIGHTING_INCLUDE_DIR) {
unset(KSYNTAXHIGHLIGHTING_INCLUDE_DIR)
unset(KSYNTAXHIGHLIGHTING_LIB_DIR) unset(KSYNTAXHIGHLIGHTING_LIB_DIR)
unset(KSYNTAXHIGHLIGHTING_INCLUDE_DIR)
} else {
isEmpty(KSYNTAXHIGHLIGHTING_INCLUDE_DIR) {
!linux: KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$absolute_path('../include/KF5/KSyntaxHighlighting/', $$KSYNTAXHIGHLIGHTING_LIB_DIR)
else: KSYNTAXHIGHLIGHTING_INCLUDE_DIR=$$absolute_path('../../include/KF5/KSyntaxHighlighting/', $$KSYNTAXHIGHLIGHTING_LIB_DIR)
}
!exists($$KSYNTAXHIGHLIGHTING_INCLUDE_DIR) {
unset(KSYNTAXHIGHLIGHTING_INCLUDE_DIR)
unset(KSYNTAXHIGHLIGHTING_LIB_DIR)
}
} }
} }