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>bb10
parent
8b4e40f535
commit
8950d3acaf
|
|
@ -4,5 +4,3 @@ SOURCES += tst_qmake.cpp testcompiler.cpp
|
|||
QT -= gui
|
||||
|
||||
cross_compile: DEFINES += QMAKE_CROSS_COMPILED
|
||||
|
||||
CONFIG += insignificant_test # QTBUG-21402
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ SOURCES=\
|
|||
test_file.cpp\
|
||||
main.cpp
|
||||
CONFIG -= debug_and_release_target
|
||||
|
||||
QT += widgets
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue