Make "nmake check" pass for gui tests in Windows.
Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_QPixmap tst_QClipboard tst_QWindow tst_QGuiApplication tst_QPainter tst_QPrinterInfo tst_QPrinter tst_QOpenGL tst_QFontDatabse tst_QFontMetrics tst_QGlyphRun tst_QRawFont Task-number: QTBUG-24128 Change-Id: I39ade8a693c4580b5cd618624e892cdcac21d78c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
parent
497622cafe
commit
38dbb45e79
@ -10,3 +10,5 @@ SOURCES += tst_qpixmap.cpp
|
||||
|
||||
RESOURCES += qpixmap.qrc
|
||||
TESTDATA += convertFromImage/* convertFromToHICON/* loadFromData/* images/*
|
||||
|
||||
win32:CONFIG += insignificant_test # QTBUG-24183
|
||||
|
@ -16,6 +16,7 @@ wince* {
|
||||
}
|
||||
|
||||
mac: CONFIG += insignificant_test # QTBUG-23057
|
||||
win32:CONFIG += insignificant_test # QTBUG-24184
|
||||
|
||||
load(testcase) # for target.path and installTestHelperApp()
|
||||
installTestHelperApp("../copier/copier",copier,copier)
|
||||
|
@ -2,3 +2,5 @@ CONFIG += testcase
|
||||
TARGET = tst_qguiapplication
|
||||
QT += core gui testlib
|
||||
SOURCES = tst_qguiapplication.cpp
|
||||
|
||||
win32:CONFIG += insignificant_test # QTBUG-24186
|
||||
|
@ -6,3 +6,4 @@ QT += core-private gui-private testlib
|
||||
SOURCES += tst_qwindow.cpp
|
||||
|
||||
mac: CONFIG += insignificant_test # QTBUG-23059
|
||||
win32:CONFIG += insignificant_test # QTBUG-24185
|
||||
|
@ -5,6 +5,7 @@ QT += widgets widgets-private printsupport testlib
|
||||
|
||||
SOURCES += tst_qpainter.cpp
|
||||
mac*:CONFIG+=insignificant_test
|
||||
win32:CONFIG += insignificant_test # QTBUG-24188
|
||||
|
||||
TESTDATA += drawEllipse/* drawLine_rop_bitmap/* drawPixmap_rop/* drawPixmap_rop_bitmap/* \
|
||||
task217400.png
|
||||
|
@ -4,3 +4,4 @@ QT += printsupport widgets testlib
|
||||
SOURCES += tst_qprinter.cpp
|
||||
|
||||
mac*:CONFIG+=insignificant_test
|
||||
win32:CONFIG += insignificant_test # QTBUG-24191
|
||||
|
@ -7,3 +7,4 @@ QT += printsupport network testlib
|
||||
DEFINES += QT_USE_USING_NAMESPACE
|
||||
|
||||
mac: CONFIG += insignificant_test # QTBUG-23060
|
||||
win32:CONFIG += insignificant_test # QTBUG-24190
|
||||
|
@ -9,3 +9,4 @@ QT += gui gui-private core-private testlib
|
||||
SOURCES += tst_qopengl.cpp
|
||||
|
||||
mac: CONFIG += insignificant_test # QTBUG-23061
|
||||
win32:CONFIG += insignificant_test # QTBUG-24192
|
||||
|
@ -11,3 +11,4 @@ wince* {
|
||||
}
|
||||
|
||||
mac: CONFIG += insignificant_test # QTBUG-23062
|
||||
win32:CONFIG += insignificant_test # QTBUG-24193
|
||||
|
@ -4,3 +4,4 @@ QT += testlib
|
||||
SOURCES += tst_qfontmetrics.cpp
|
||||
RESOURCES += testfont.qrc
|
||||
|
||||
win32:CONFIG += insignificant_test # QTBUG-24195
|
||||
|
@ -10,3 +10,5 @@ wince* {
|
||||
} else {
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
}
|
||||
|
||||
win32:CONFIG += insignificant_test # QTBUG-24196
|
||||
|
@ -9,3 +9,5 @@ SOURCES += \
|
||||
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
|
||||
|
||||
TESTDATA += testfont_bold_italic.ttf testfont.ttf
|
||||
|
||||
win32:CONFIG += insignificant_test # QTBUG-24197
|
||||
|
Loading…
Reference in New Issue
Block a user