summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/qmake/testdata/shadow_files
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-09-22 13:47:10 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-23 10:49:27 +0200
commit8950d3acaf111a6a413107ea59cc4979679efe78 (patch)
treec7896abea9480d3af7a1d89b23843eee747f4e95 /tests/auto/tools/qmake/testdata/shadow_files
parent8b4e40f5354ef81c40d8da35e0e79b2a87278e31 (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/tools/qmake/testdata/shadow_files')
-rw-r--r--tests/auto/tools/qmake/testdata/shadow_files/main.cpp4
1 files changed, 2 insertions, 2 deletions
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();
}