diff options
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/app/config-ui/config-ui.pro | 3 | ||||
| -rw-r--r-- | src/plugins/plugins.pri | 5 | ||||
| -rw-r--r-- | static.pro | 14 | ||||
| -rw-r--r-- | tests/fuzzy-test/fuzzy-test.qbs | 1 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
6 files changed, 4 insertions, 24 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index d3e33883c..a819ec2a2 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -6,4 +6,4 @@ SUBDIRS =\ config \ qbs-qmltypes -lessThan(QT_MAJOR_VERSION, 5)|!isEmpty(QT.widgets.name):SUBDIRS += config-ui +!isEmpty(QT.widgets.name):SUBDIRS += config-ui diff --git a/src/app/config-ui/config-ui.pro b/src/app/config-ui/config-ui.pro index 0c406694d..a62de6dae 100644 --- a/src/app/config-ui/config-ui.pro +++ b/src/app/config-ui/config-ui.pro @@ -1,8 +1,7 @@ include(../app.pri) CONFIG -= console -QT += gui -greaterThan(QT_MAJOR_VERSION, 4):QT += widgets +QT += gui widgets TARGET = qbs-config-ui diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index a348d52fd..3775c601a 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -1,10 +1,7 @@ !isEmpty(QBS_PLUGINS_BUILD_DIR) { destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} } else { - greaterThan(QT_MAJOR_VERSION, 4): \ - destdirPrefix = $$shadowed($$PWD)/../../lib - else: \ - destdirPrefix = ../../../../lib # Note: Will break if pri file is included from some other place + destdirPrefix = $$shadowed($$PWD)/../../lib } DESTDIR = $${destdirPrefix}/qbs/plugins TEMPLATE = lib diff --git a/static.pro b/static.pro index 34548c0c0..c462dfd2a 100644 --- a/static.pro +++ b/static.pro @@ -38,23 +38,9 @@ defineReplace(cleanPath) { } # For use in custom compilers which just copy files -isEqual(QT_MAJOR_VERSION, 5) { defineReplace(stripSrcDir) { return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) } -} else { # qt5 -win32:i_flag = i -defineReplace(stripSrcDir) { - win32 { - !contains(1, ^.:.*):1 = $$OUT_PWD/$$1 - } else { - !contains(1, ^/.*):1 = $$OUT_PWD/$$1 - } - out = $$cleanPath($$1) - out ~= s|^$$re_escape($$_PRO_FILE_PWD_/)||$$i_flag - return($$out) -} -} # qt5 for(data_dir, DATA_DIRS) { files = $$files($$PWD/$$data_dir/*, true) diff --git a/tests/fuzzy-test/fuzzy-test.qbs b/tests/fuzzy-test/fuzzy-test.qbs index c9c4fb0ac..403e56c64 100644 --- a/tests/fuzzy-test/fuzzy-test.qbs +++ b/tests/fuzzy-test/fuzzy-test.qbs @@ -3,7 +3,6 @@ import qbs QtApplication { name: "qbs_fuzzy-test" destinationDirectory: "bin" - condition: Qt.core.versionMajor >= 5 // We use QDir::removeRecursively() type: "application" consoleApplication: true files: [ diff --git a/tests/tests.pro b/tests/tests.pro index e85059d70..8a102073b 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = auto -greaterThan(QT_MAJOR_VERSION, 4):SUBDIRS += fuzzy-test # We use QDir::removeRecursively() +SUBDIRS = auto fuzzy-test |