diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-09-22 13:47:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 10:49:27 +0200 |
| commit | 8950d3acaf111a6a413107ea59cc4979679efe78 (patch) | |
| tree | c7896abea9480d3af7a1d89b23843eee747f4e95 /tests/auto | |
| parent | 8b4e40f5354ef81c40d8da35e0e79b2a87278e31 (diff) | |
Re-enabled test and made it pass on Linux
Task-number: QTBUG-21402
Change-Id: I54226c0aa63c70f9bb8ed8be3784918dd70e5592
Reviewed-on: http://codereview.qt-project.org/5382
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Diffstat (limited to 'tests/auto')
8 files changed, 13 insertions, 15 deletions
diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro index 40cf5a81b6..02f7e56d11 100644 --- a/tests/auto/tools/qmake/qmake.pro +++ b/tests/auto/tools/qmake/qmake.pro @@ -4,5 +4,3 @@ SOURCES += tst_qmake.cpp testcompiler.cpp QT -= gui cross_compile: DEFINES += QMAKE_CROSS_COMPILED - -CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/tools/qmake/testdata/include_dir/foo.pro b/tests/auto/tools/qmake/testdata/include_dir/foo.pro index ff4a5cd158..827a408274 100644 --- a/tests/auto/tools/qmake/testdata/include_dir/foo.pro +++ b/tests/auto/tools/qmake/testdata/include_dir/foo.pro @@ -8,5 +8,5 @@ SOURCES=\ test_file.cpp\ main.cpp CONFIG -= debug_and_release_target - +QT += widgets diff --git a/tests/auto/tools/qmake/testdata/install_depends/main.cpp b/tests/auto/tools/qmake/testdata/install_depends/main.cpp index 8471e367e9..05d257f8b6 100644 --- a/tests/auto/tools/qmake/testdata/install_depends/main.cpp +++ b/tests/auto/tools/qmake/testdata/install_depends/main.cpp @@ -41,11 +41,11 @@ #include "test_file.h" -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); SomeObject sc; return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/one_space/main.cpp b/tests/auto/tools/qmake/testdata/one_space/main.cpp index 52daa0ed03..a47ff9b99d 100644 --- a/tests/auto/tools/qmake/testdata/one_space/main.cpp +++ b/tests/auto/tools/qmake/testdata/one_space/main.cpp @@ -41,10 +41,10 @@ -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp index d1d1144c4f..91dfc156b9 100644 --- a/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp @@ -41,11 +41,11 @@ -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/shadow_files/main.cpp b/tests/auto/tools/qmake/testdata/shadow_files/main.cpp index 8471e367e9..05d257f8b6 100644 --- a/tests/auto/tools/qmake/testdata/shadow_files/main.cpp +++ b/tests/auto/tools/qmake/testdata/shadow_files/main.cpp @@ -41,11 +41,11 @@ #include "test_file.h" -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); SomeObject sc; return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/simple_app/main.cpp b/tests/auto/tools/qmake/testdata/simple_app/main.cpp index 9ce4f108e5..697c7c050a 100644 --- a/tests/auto/tools/qmake/testdata/simple_app/main.cpp +++ b/tests/auto/tools/qmake/testdata/simple_app/main.cpp @@ -42,11 +42,11 @@ #include "test_file.h" -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); SomeObject sc; return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp index 9ce4f108e5..697c7c050a 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp @@ -42,11 +42,11 @@ #include "test_file.h" -#include <qapplication.h> +#include <qguiapplication.h> int main( int argc, char **argv ) { - QApplication a( argc, argv ); + QGuiApplication a( argc, argv ); SomeObject sc; return a.exec(); } |