diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-03-21 09:03:30 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-03-21 07:07:30 +0000 |
| commit | e5262fba5fa705b97314715c2db2e0bb0e40236b (patch) | |
| tree | b747e318bbe81b63bfbcc43e25298d8c806c624a | |
| parent | f7bcf2813c9f61a1df14158fda8a810c97c1af50 (diff) | |
| download | qt-creator-e5262fba5fa705b97314715c2db2e0bb0e40236b.tar.gz | |
Qbs: Remove versions validation from some tests
Qt < 5.4 is not supported for building.
Change-Id: I8b008da5f21dc13c36fea535ea8e468ad252fd5a
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
5 files changed, 3 insertions, 13 deletions
diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs index 3350943ee7..d6f50c2e66 100644 --- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs +++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs @@ -6,14 +6,10 @@ CppApplication { Depends { name: "cpp" } Depends { name: "Qt.core" } - Depends { - condition: Qt.core.versionMajor > 4 - name: "Qt.qmltest" - } + Depends { name: "Qt.qmltest" } Group { name: "main application" - condition: Qt.core.versionMajor > 4 files: [ "main.cpp" ] } diff --git a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs index 63a97fb7b7..18c0d2bba2 100644 --- a/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs +++ b/src/plugins/autotest/unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs @@ -6,14 +6,11 @@ CppApplication { Depends { name: "cpp" } Depends { name: "Qt.core" } - Depends { - condition: Qt.core.versionMajor > 4 - name: "Qt.qmltest" - } + Depends { name: "Qt.qmltest" } Group { - condition: Qt.core.versionMajor > 4 name: "main application" + files: [ "main.cpp" ] } diff --git a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs b/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs index 3a70ab857c..3e2eef8e29 100644 --- a/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs +++ b/tests/auto/timeline/timelineitemsrenderpass/timelineitemsrenderpass.qbs @@ -3,7 +3,6 @@ import QtcFunctions import "../timelineautotest.qbs" as TimelineAutotest TimelineAutotest { - condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.4") name: "TimelineItemsRenderPass autotest" Group { name: "Test sources" diff --git a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs b/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs index 2e8d34c9a3..4f3c25e758 100644 --- a/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs +++ b/tests/auto/timeline/timelinenotesrenderpass/timelinenotesrenderpass.qbs @@ -3,7 +3,6 @@ import QtcFunctions import "../timelineautotest.qbs" as TimelineAutotest TimelineAutotest { - condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.4") name: "TimelineNotesRenderPass autotest" Group { name: "Test sources" diff --git a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs b/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs index 25561801dd..d600da3b2c 100644 --- a/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs +++ b/tests/auto/timeline/timelineselectionrenderpass/timelineselectionrenderpass.qbs @@ -3,7 +3,6 @@ import QtcFunctions import "../timelineautotest.qbs" as TimelineAutotest TimelineAutotest { - condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.4") name: "TimelineSelectionRenderPass autotest" Group { name: "Test sources" |