diff options
| author | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-30 07:45:00 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-30 10:12:26 +0200 |
| commit | 5e795dcb8668a3a83b62601a5f83e393d113e12e (patch) | |
| tree | 91900a6378b1cb2e40731a200d62268900fe42b2 | |
| parent | 25ef6a257d393b28cf5f4fd00569c7683e733378 (diff) | |
Remove unnecessary Qt version checks
There's no need to check if the major Qt version is higher than 4
because from now on Charts is supported from Qt 5.4.
Change-Id: I7addcb19e5c774ce9835a0f7c6150d9e3bc0404a
Task-number: QTRD-2844
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| -rw-r--r-- | tests/boxplottester/boxplottester.pro | 5 | ||||
| -rw-r--r-- | tests/chartwidgettest/chartwidgettest.pro | 5 | ||||
| -rw-r--r-- | tests/polarcharttest/polarcharttest.pro | 4 | ||||
| -rw-r--r-- | tests/presenterchart/presenterchart.pro | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/tests/boxplottester/boxplottester.pro b/tests/boxplottester/boxplottester.pro index 575ae45a..2568adc3 100644 --- a/tests/boxplottester/boxplottester.pro +++ b/tests/boxplottester/boxplottester.pro @@ -5,10 +5,7 @@ TEMPLATE = app QT += charts -QT += core gui -contains(QT_MAJOR_VERSION, 5) { - QT += widgets -} +QT += core gui widgets SOURCES += main.cpp \ mainwidget.cpp \ diff --git a/tests/chartwidgettest/chartwidgettest.pro b/tests/chartwidgettest/chartwidgettest.pro index 97845ff8..db8416ba 100644 --- a/tests/chartwidgettest/chartwidgettest.pro +++ b/tests/chartwidgettest/chartwidgettest.pro @@ -4,10 +4,7 @@ TEMPLATE = app -QT += core gui opengl -contains(QT_MAJOR_VERSION, 5) { - QT += widgets -} +QT += core gui opengl widgets SOURCES += main.cpp \ mainwidget.cpp \ diff --git a/tests/polarcharttest/polarcharttest.pro b/tests/polarcharttest/polarcharttest.pro index 9646fbd2..0c892c84 100644 --- a/tests/polarcharttest/polarcharttest.pro +++ b/tests/polarcharttest/polarcharttest.pro @@ -2,9 +2,7 @@ error( "Couldn't find the test.pri file!" ) } -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = polarcharttest TEMPLATE = app diff --git a/tests/presenterchart/presenterchart.pro b/tests/presenterchart/presenterchart.pro index 88cde7af..bd3367d5 100644 --- a/tests/presenterchart/presenterchart.pro +++ b/tests/presenterchart/presenterchart.pro @@ -5,4 +5,4 @@ TARGET = presenterchart HEADERS += chartview.h SOURCES += main.cpp chartview.cpp -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += widgets |