diff options
Diffstat (limited to 'tests/auto')
210 files changed, 290 insertions, 477 deletions
diff --git a/tests/auto/gestures/gestures.pro b/tests/auto/gestures/gestures.pro index da5610f2f6..538e4f5d68 100644 --- a/tests/auto/gestures/gestures.pro +++ b/tests/auto/gestures/gestures.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_gestures.cpp diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 0f976ffb95..d18dc1c0a2 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -5,5 +5,3 @@ CONFIG += uitools contains(QT_CONFIG,dbus): QT += dbus contains(QT_CONFIG,opengl): QT += opengl -contains(QT_CONFIG,openvg): QT += openvg - diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp index 41537776a7..831e7fe50a 100644 --- a/tests/auto/headersclean/tst_headersclean.cpp +++ b/tests/auto/headersclean/tst_headersclean.cpp @@ -64,10 +64,6 @@ #include <QtDBus/QtDBus> #endif -#ifndef QT_NO_OPENVG -#include <QtOpenVG/QtOpenVG> -#endif - class tst_HeadersClean: public QObject { Q_OBJECT diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/languagechange/languagechange.pro index f161c50864..cc91fc2d55 100644 --- a/tests/auto/languagechange/languagechange.pro +++ b/tests/auto/languagechange/languagechange.pro @@ -1,4 +1,4 @@ load(qttest_p4) -QT += core-private +QT += widgets core-private SOURCES += tst_languagechange.cpp diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp index 3a93209ccd..e1663a5830 100644 --- a/tests/auto/languagechange/tst_languagechange.cpp +++ b/tests/auto/languagechange/tst_languagechange.cpp @@ -46,10 +46,10 @@ #include <QtCore/QSet> #include <QtCore/QTranslator> #include <private/qthread_p.h> -#include <QtGui/QInputDialog> -#include <QtGui/QColorDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QInputDialog> +#include <QtWidgets/QColorDialog> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QDesktopWidget> //TESTED_CLASS= diff --git a/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro index 70ea53c369..25a052b5f0 100644 --- a/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro +++ b/tests/auto/nativeimagehandleprovider/nativeimagehandleprovider.pro @@ -5,5 +5,4 @@ QT += gui-private SOURCES += tst_nativeimagehandleprovider.cpp symbian { LIBS += -lfbscli -lbitgdi - contains(QT_CONFIG, openvg): QT *= openvg } diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/qabstractbutton/qabstractbutton.pro index 2e52585700..15d90ed4e1 100644 --- a/tests/auto/qabstractbutton/qabstractbutton.pro +++ b/tests/auto/qabstractbutton/qabstractbutton.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qabstractbutton.cpp diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro index 52c4e96f99..543065a4c0 100644 --- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro @@ -1,7 +1,7 @@ load(qttest_p4) INCLUDEPATH += $$PWD/../modeltest - +QT += widgets SOURCES += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp index cf4cfd76ec..6a7a16eae8 100644 --- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include <QtCore/QtCore> -#include <QtGui/QSortFilterProxyModel> +#include <QtWidgets/QSortFilterProxyModel> //TESTED_CLASS=QAbstractListModel QAbstractTableModel //TESTED_FILES= diff --git a/tests/auto/qabstractitemview/qabstractitemview.pro b/tests/auto/qabstractitemview/qabstractitemview.pro index 0d0d51c38a..e6c2d84b5f 100644 --- a/tests/auto/qabstractitemview/qabstractitemview.pro +++ b/tests/auto/qabstractitemview/qabstractitemview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qabstractitemview.cpp diff --git a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro index 8d9b142290..85f0761815 100644 --- a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro +++ b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qabstractprintdialog.cpp diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro index d1bff92543..7a6a841796 100644 --- a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro +++ b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qabstractproxymodel.cpp diff --git a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro b/tests/auto/qabstractscrollarea/qabstractscrollarea.pro index 9e7b6e0f95..e4bc3f6495 100644 --- a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro +++ b/tests/auto/qabstractscrollarea/qabstractscrollarea.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qabstractscrollarea.cpp diff --git a/tests/auto/qabstractslider/qabstractslider.pro b/tests/auto/qabstractslider/qabstractslider.pro index 13a2e873a9..4507859ace 100644 --- a/tests/auto/qabstractslider/qabstractslider.pro +++ b/tests/auto/qabstractslider/qabstractslider.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qabstractslider.cpp diff --git a/tests/auto/qabstractspinbox/qabstractspinbox.pro b/tests/auto/qabstractspinbox/qabstractspinbox.pro index 293eff3c0f..e156b2493d 100644 --- a/tests/auto/qabstractspinbox/qabstractspinbox.pro +++ b/tests/auto/qabstractspinbox/qabstractspinbox.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qabstractspinbox.cpp diff --git a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro index 701b24b5b3..22b013e37e 100644 --- a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro +++ b/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qabstracttextdocumentlayout.cpp diff --git a/tests/auto/qaction/qaction.pro b/tests/auto/qaction/qaction.pro index a129cd66ac..9c3648d52f 100644 --- a/tests/auto/qaction/qaction.pro +++ b/tests/auto/qaction/qaction.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qaction.cpp diff --git a/tests/auto/qactiongroup/qactiongroup.pro b/tests/auto/qactiongroup/qactiongroup.pro index d468815674..9b8636968b 100644 --- a/tests/auto/qactiongroup/qactiongroup.pro +++ b/tests/auto/qactiongroup/qactiongroup.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qactiongroup.cpp diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro index 3193764709..3e00e08295 100644 --- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro @@ -11,6 +11,7 @@ wince*:TARGET = ../desktopsettingsaware symbian:TARGET = desktopsettingsaware # Input +QT += widgets SOURCES += main.cpp CONFIG += qt warn_on create_prl link_prl CONFIG -= app_bundle diff --git a/tests/auto/qapplication/modal/modal.pro b/tests/auto/qapplication/modal/modal.pro index 836f6ffab0..9ed69769bb 100644 --- a/tests/auto/qapplication/modal/modal.pro +++ b/tests/auto/qapplication/modal/modal.pro @@ -1,4 +1,5 @@ TEMPLATE = app +QT += widgets TARGET = DEPENDPATH += . INCLUDEPATH += . diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro index adda481829..ced508d738 100644 --- a/tests/auto/qapplication/test/test.pro +++ b/tests/auto/qapplication/test/test.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += ../tst_qapplication.cpp @@ -8,7 +9,7 @@ TARGET = ../tst_qapplication wince* { additional.files = ../desktopsettingsaware/desktopsettingsaware.exe additional.path = desktopsettingsaware - someTest.files = test.pro + someTest.files e= test.pro someTest.path = test DEPLOYMENT += additional deploy someTest } diff --git a/tests/auto/qapplication/wincmdline/wincmdline.pro b/tests/auto/qapplication/wincmdline/wincmdline.pro index 8a8ca3d6b3..3ba8f48167 100644 --- a/tests/auto/qapplication/wincmdline/wincmdline.pro +++ b/tests/auto/qapplication/wincmdline/wincmdline.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . +QT += widgets SOURCES += main.cpp diff --git a/tests/auto/qboxlayout/qboxlayout.pro b/tests/auto/qboxlayout/qboxlayout.pro index 3195f4dc9b..c37f12f74f 100644 --- a/tests/auto/qboxlayout/qboxlayout.pro +++ b/tests/auto/qboxlayout/qboxlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qboxlayout.cpp diff --git a/tests/auto/qbrush/qbrush.pro b/tests/auto/qbrush/qbrush.pro index c17784cbec..1c3efd46be 100644 --- a/tests/auto/qbrush/qbrush.pro +++ b/tests/auto/qbrush/qbrush.pro @@ -1,5 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qbrush.cpp - - - diff --git a/tests/auto/qbuttongroup/qbuttongroup.pro b/tests/auto/qbuttongroup/qbuttongroup.pro index 4f8b2113b1..6f506e8f06 100644 --- a/tests/auto/qbuttongroup/qbuttongroup.pro +++ b/tests/auto/qbuttongroup/qbuttongroup.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qbuttongroup.cpp diff --git a/tests/auto/qcalendarwidget/qcalendarwidget.pro b/tests/auto/qcalendarwidget/qcalendarwidget.pro index 62b137b347..d250b83537 100644 --- a/tests/auto/qcalendarwidget/qcalendarwidget.pro +++ b/tests/auto/qcalendarwidget/qcalendarwidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qcalendarwidget.cpp diff --git a/tests/auto/qcheckbox/qcheckbox.pro b/tests/auto/qcheckbox/qcheckbox.pro index c2fee48133..aa1f35b3c9 100644 --- a/tests/auto/qcheckbox/qcheckbox.pro +++ b/tests/auto/qcheckbox/qcheckbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qcheckbox.cpp diff --git a/tests/auto/qclipboard/copier/copier.pro b/tests/auto/qclipboard/copier/copier.pro index 1c188ca7de..d345d33eb5 100644 --- a/tests/auto/qclipboard/copier/copier.pro +++ b/tests/auto/qclipboard/copier/copier.pro @@ -3,6 +3,7 @@ TARGET = DEPENDPATH += . INCLUDEPATH += . CONFIG -= app_bundle +QT += widgets win32: DESTDIR = ../copier # Input SOURCES += main.cpp diff --git a/tests/auto/qclipboard/paster/paster.pro b/tests/auto/qclipboard/paster/paster.pro index 8580644b1e..d214c9e90a 100644 --- a/tests/auto/qclipboard/paster/paster.pro +++ b/tests/auto/qclipboard/paster/paster.pro @@ -4,7 +4,7 @@ DEPENDPATH += . INCLUDEPATH += . win32: DESTDIR = ../paster CONFIG -= app_bundle - +QT += widgets # Input SOURCES += main.cpp diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp index 94981cf8e5..4d3bb29e13 100644 --- a/tests/auto/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/qclipboard/tst_qclipboard.cpp @@ -42,7 +42,7 @@ #include <QtTest/QtTest> #include <QtCore/QDebug> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QClipboard> #ifdef Q_WS_MAC #include <Carbon/Carbon.h> diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/qcolordialog/qcolordialog.pro index 830f9fafe2..4f195dac2b 100644 --- a/tests/auto/qcolordialog/qcolordialog.pro +++ b/tests/auto/qcolordialog/qcolordialog.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qcolordialog.cpp diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro index e36df030c2..bca9e75ba5 100644 --- a/tests/auto/qcolumnview/qcolumnview.pro +++ b/tests/auto/qcolumnview/qcolumnview.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += widgets widgets-private QT += gui-private core-private SOURCES += tst_qcolumnview.cpp diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp index 7f6d43a45b..493e920262 100644 --- a/tests/auto/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp @@ -44,9 +44,9 @@ #include <qstandarditemmodel.h> #include <qitemdelegate.h> #include <qcolumnview.h> -#include "../../../src/gui/itemviews/qcolumnviewgrip_p.h" +#include "../../../src/widgets/itemviews/qcolumnviewgrip_p.h" #ifndef Q_OS_SYMBIAN -#include "../../../src/gui/dialogs/qfilesystemmodel_p.h" +#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" #endif #include <qdirmodel.h> #include <qstringlistmodel.h> diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro index a8f0e6ad23..c3da909437 100644 --- a/tests/auto/qcombobox/qcombobox.pro +++ b/tests/auto/qcombobox/qcombobox.pro @@ -1,4 +1,4 @@ load(qttest_p4) -QT += gui-private core-private +QT += widgets widgets-private gui-private core-private SOURCES += tst_qcombobox.cpp diff --git a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro b/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro index db3a336c36..497b8298a2 100644 --- a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro +++ b/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qcommandlinkbutton.cpp diff --git a/tests/auto/qcompleter/qcompleter.pro b/tests/auto/qcompleter/qcompleter.pro index bd352d819c..cde64ec672 100644 --- a/tests/auto/qcompleter/qcompleter.pro +++ b/tests/auto/qcompleter/qcompleter.pro @@ -1,6 +1,7 @@ load(qttest_p4) TEMPLATE = app TARGET = tst_qcompleter +QT += widgets DEPENDPATH += . INCLUDEPATH += . .. diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/qcomplextext/qcomplextext.pro index bd85daa6b4..725594cdd6 100644 --- a/tests/auto/qcomplextext/qcomplextext.pro +++ b/tests/auto/qcomplextext/qcomplextext.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qcomplextext.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro b/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro index d8e0cd043c..64e3b57291 100644 --- a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro +++ b/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdatawidgetmapper.cpp diff --git a/tests/auto/qdatetimeedit/qdatetimeedit.pro b/tests/auto/qdatetimeedit/qdatetimeedit.pro index 19e92d0155..47356d448c 100644 --- a/tests/auto/qdatetimeedit/qdatetimeedit.pro +++ b/tests/auto/qdatetimeedit/qdatetimeedit.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdatetimeedit.cpp wincewm50smart-msvc2005: DEFINES += WINCE_NO_MODIFIER_KEYS diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro index 43f6cba267..0e51ed0459 100644 --- a/tests/auto/qdesktopservices/qdesktopservices.pro +++ b/tests/auto/qdesktopservices/qdesktopservices.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += widgets SOURCES += tst_qdesktopservices.cpp TARGET = tst_qdesktopservices diff --git a/tests/auto/qdesktopwidget/qdesktopwidget.pro b/tests/auto/qdesktopwidget/qdesktopwidget.pro index bc287c09b0..730b273c4f 100644 --- a/tests/auto/qdesktopwidget/qdesktopwidget.pro +++ b/tests/auto/qdesktopwidget/qdesktopwidget.pro @@ -1,5 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdesktopwidget.cpp - - - diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp index e11fbf09c3..fc696443a1 100644 --- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp +++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QDesktopWidget> #include <QDebug> //TESTED_CLASS= diff --git a/tests/auto/qdial/qdial.pro b/tests/auto/qdial/qdial.pro index 7cd245e6a9..acf66de430 100644 --- a/tests/auto/qdial/qdial.pro +++ b/tests/auto/qdial/qdial.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdial.cpp diff --git a/tests/auto/qdialog/qdialog.pro b/tests/auto/qdialog/qdialog.pro index 7fdb7fced0..8f71e1e2cc 100644 --- a/tests/auto/qdialog/qdialog.pro +++ b/tests/auto/qdialog/qdialog.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdialog.cpp diff --git a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro b/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro index 70b65f644e..efbeca0c1b 100644 --- a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro +++ b/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdialogbuttonbox.cpp TARGET = tst_qdialogbuttonbox diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index 13ecd90bd3..def5e60549 100644 --- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/QPushButton> -#include <QtGui/QStyle> -#include <QtGui/QLayout> -#include <QtGui/QDialog> -#include <QtGui/QAction> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QStyle> +#include <QtWidgets/QLayout> +#include <QtWidgets/QDialog> +#include <QtWidgets/QAction> #include <qdialogbuttonbox.h> #include <limits.h> diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro index 7037a79934..7c0409334c 100644 --- a/tests/auto/qdirmodel/qdirmodel.pro +++ b/tests/auto/qdirmodel/qdirmodel.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdirmodel.cpp wince*|symbian { diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/qdockwidget/qdockwidget.pro index 5f92e5db19..6409ac6efb 100644 --- a/tests/auto/qdockwidget/qdockwidget.pro +++ b/tests/auto/qdockwidget/qdockwidget.pro @@ -1,5 +1,5 @@ load(qttest_p4) - +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qdockwidget.cpp diff --git a/tests/auto/qdoublespinbox/qdoublespinbox.pro b/tests/auto/qdoublespinbox/qdoublespinbox.pro index 3aec0de68e..6f2b8b2d74 100644 --- a/tests/auto/qdoublespinbox/qdoublespinbox.pro +++ b/tests/auto/qdoublespinbox/qdoublespinbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdoublespinbox.cpp diff --git a/tests/auto/qdoublevalidator/qdoublevalidator.pro b/tests/auto/qdoublevalidator/qdoublevalidator.pro index 1fe3f7b838..7fbb72bb7f 100644 --- a/tests/auto/qdoublevalidator/qdoublevalidator.pro +++ b/tests/auto/qdoublevalidator/qdoublevalidator.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qdoublevalidator.cpp diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/qdrag/qdrag.pro index ad36fa5ada..d9d645559b 100644 --- a/tests/auto/qdrag/qdrag.pro +++ b/tests/auto/qdrag/qdrag.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qdrag.cpp diff --git a/tests/auto/qerrormessage/qerrormessage.pro b/tests/auto/qerrormessage/qerrormessage.pro index 1c24aa83cb..363d085cbf 100644 --- a/tests/auto/qerrormessage/qerrormessage.pro +++ b/tests/auto/qerrormessage/qerrormessage.pro @@ -4,5 +4,7 @@ TARGET = tst_qerrormessage DEPENDPATH += . INCLUDEPATH += . +QT += widgets + # Input SOURCES += tst_qerrormessage.cpp diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro index 57828b1bd4..c58dc0d5e7 100644 --- a/tests/auto/qfiledialog/qfiledialog.pro +++ b/tests/auto/qfiledialog/qfiledialog.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qfiledialog.cpp diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 08d2e88f3c..3bb682c7e9 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -62,9 +62,9 @@ #include <qlayout.h> #include "../../shared/util.h" #if defined QT_BUILD_INTERNAL -#include "../../../src/gui/dialogs/qsidebar_p.h" -#include "../../../src/gui/dialogs/qfilesystemmodel_p.h" -#include "../../../src/gui/dialogs/qfiledialog_p.h" +#include "../../../src/widgets/dialogs/qsidebar_p.h" +#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" +#include "../../../src/widgets/dialogs/qfiledialog_p.h" #endif #include <QFileDialog> #include <QFileSystemModel> diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro index 5d1d72195d..14de040ec5 100644 --- a/tests/auto/qfiledialog2/qfiledialog2.pro +++ b/tests/auto/qfiledialog2/qfiledialog2.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qfiledialog2.cpp diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp index afa2e8f64a..085bdbc80e 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp @@ -61,9 +61,9 @@ #include <qlineedit.h> #include <qlayout.h> #include "../../shared/util.h" -#include "../../../src/gui/dialogs/qsidebar_p.h" -#include "../../../src/gui/dialogs/qfilesystemmodel_p.h" -#include "../../../src/gui/dialogs/qfiledialog_p.h" +#include "../../../src/widgets/dialogs/qsidebar_p.h" +#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" +#include "../../../src/widgets/dialogs/qfiledialog_p.h" #include "../network-settings.h" diff --git a/tests/auto/qfileiconprovider/qfileiconprovider.pro b/tests/auto/qfileiconprovider/qfileiconprovider.pro index 3bf83ae5da..1e3d26de00 100644 --- a/tests/auto/qfileiconprovider/qfileiconprovider.pro +++ b/tests/auto/qfileiconprovider/qfileiconprovider.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qfileiconprovider.cpp diff --git a/tests/auto/qfileopenevent/qfileopenevent.pro b/tests/auto/qfileopenevent/qfileopenevent.pro index 45978d7b7e..73724828db 100644 --- a/tests/auto/qfileopenevent/qfileopenevent.pro +++ b/tests/auto/qfileopenevent/qfileopenevent.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs +QT += widgets SUBDIRS = test qfileopeneventexternal diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro index b95ed45edd..cb61b82e38 100644 --- a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro +++ b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = qfileopeneventexternal -QT += core gui +QT += core gui widgets SOURCES += qfileopeneventexternal.cpp symbian: { RSS_RULES += "embeddability=KAppEmbeddable;" diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index ab121306e3..b0b6d7a18d 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -1,6 +1,7 @@ CONFIG += qttest_p4 -QT = core-private gui +QT += widgets widgets-private +QT += core-private gui SOURCES += tst_qfilesystemmodel.cpp TARGET = tst_qfilesystemmodel diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index 5f610945ab..c2b3e7c521 100644 --- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -42,7 +42,7 @@ #include <QtTest/QtTest> #ifdef QT_BUILD_INTERNAL -#include "../../../src/gui/dialogs/qfilesystemmodel_p.h" +#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" #endif #include <QFileSystemModel> #include <QFileIconProvider> diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/qfocusevent/qfocusevent.pro index 17431cf5a1..d904a0b0bf 100644 --- a/tests/auto/qfocusevent/qfocusevent.pro +++ b/tests/auto/qfocusevent/qfocusevent.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qfocusevent.cpp diff --git a/tests/auto/qfocusframe/qfocusframe.pro b/tests/auto/qfocusframe/qfocusframe.pro index afb7206b00..0fcc9bf23d 100644 --- a/tests/auto/qfocusframe/qfocusframe.pro +++ b/tests/auto/qfocusframe/qfocusframe.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qfocusframe.cpp diff --git a/tests/auto/qfont/qfont.pro b/tests/auto/qfont/qfont.pro index b071d88dce..891cb0a093 100644 --- a/tests/auto/qfont/qfont.pro +++ b/tests/auto/qfont/qfont.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qfont.cpp diff --git a/tests/auto/qfontcombobox/qfontcombobox.pro b/tests/auto/qfontcombobox/qfontcombobox.pro index b7d32f5484..9e984e0d99 100644 --- a/tests/auto/qfontcombobox/qfontcombobox.pro +++ b/tests/auto/qfontcombobox/qfontcombobox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qfontcombobox.cpp diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/qfontdialog/qfontdialog.pro index d4edaaca21..60320476e2 100644 --- a/tests/auto/qfontdialog/qfontdialog.pro +++ b/tests/auto/qfontdialog/qfontdialog.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qfontdialog.cpp diff --git a/tests/auto/qformlayout/qformlayout.pro b/tests/auto/qformlayout/qformlayout.pro index baeb6741ca..24c452af9f 100644 --- a/tests/auto/qformlayout/qformlayout.pro +++ b/tests/auto/qformlayout/qformlayout.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qformlayout.cpp diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp index 8da79ef60a..f35933d0dc 100644 --- a/tests/auto/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/qformlayout/tst_qformlayout.cpp @@ -46,9 +46,8 @@ #include <qwidget.h> #include <qwindowsstyle.h> #include <qsizepolicy.h> -#include <QtGui> -#include <QtGui/QWindowsStyle> +#include <QtWidgets/QWindowsStyle> #include <QStyleFactory> #include <qformlayout.h> diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 74d9803d2f..b0a77a1d5e 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -4,7 +4,7 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl-private gui-private core-private +QT += widgets widgets-private opengl-private gui-private core-private contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index e1829b0b6b..5aa2936e3e 100644 --- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 5987f4a8a3..f496146165 100644 --- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/qgraphicsanchorlayout.h> +#include <QtWidgets/qgraphicsanchorlayout.h> #include <private/qgraphicsanchorlayout_p.h> -#include <QtGui/qgraphicswidget.h> -#include <QtGui/qgraphicsproxywidget.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qgraphicswidget.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qwindowsstyle.h> class tst_QGraphicsAnchorLayout : public QObject { Q_OBJECT diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro index 535de0c07e..bcad43fc12 100644 --- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro +++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout1.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index 4329f1350b..05f08e8719 100644 --- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include <QTest> #include <QMetaType> -#include <QtGui/qgraphicsanchorlayout.h> +#include <QtWidgets/qgraphicsanchorlayout.h> #include <private/qgraphicsanchorlayout_p.h> #define TEST_COMPLEX_CASES diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro index 963eca25c4..171ab3ffda 100644 --- a/tests/auto/qgraphicseffect/qgraphicseffect.pro +++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicseffect.cpp diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp index 1f5563c6b7..2cd1a1dca6 100644 --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp @@ -41,13 +41,13 @@ #include <QtTest/QtTest> -#include <QtGui/qdesktopwidget.h> -#include <QtGui/qgraphicseffect.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qgraphicsscene.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicswidget.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qgraphicseffect.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qgraphicsscene.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicswidget.h> +#include <QtWidgets/qstyleoption.h> #include "../../shared/util.h" #include <private/qgraphicseffect_p.h> diff --git a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro index da437e959c..44ec70eef3 100644 --- a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro +++ b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicseffectsource.cpp diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp index 5d684c5beb..a5dcf738e7 100644 --- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp +++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/qgraphicseffect.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qgraphicsscene.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qgraphicseffect.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qgraphicsscene.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qstyleoption.h> #include <private/qgraphicseffect_p.h> diff --git a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro index d66d639cdd..f0e9a4b0f8 100644 --- a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -1,4 +1,6 @@ load(qttest_p4) + +QT += widgets SOURCES += tst_qgraphicsgridlayout.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro index ed30cae759..bfcf87721f 100644 --- a/tests/auto/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsitem.cpp DEFINES += QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index cd66e10b79..9e90a9f03c 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -42,7 +42,6 @@ #include <QtTest/QtTest> -#include <private/qtextcontrol_p.h> #include <private/qgraphicsitem_p.h> #include <private/qgraphicsview_p.h> #include <private/qgraphicsscene_p.h> diff --git a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro b/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro index 01875c7b50..5d723da32e 100644 --- a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro +++ b/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicsitemanimation.cpp DEFINES += QT_NO_CAST_TO_ASCII CONFIG += parallel_test diff --git a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro b/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro index 816224bd8b..ed9adf87fd 100644 --- a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro +++ b/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicslayoutitem.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro index df5a827787..1f7ff0cc6e 100644 --- a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicslinearlayout.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro index 648a81f6c6..5232ec8372 100644 --- a/tests/auto/qgraphicsobject/qgraphicsobject.pro +++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets QT += core-private SOURCES += tst_qgraphicsobject.cpp diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro index 6b4db95ebe..6b1ad34057 100644 --- a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro +++ b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicspixmapitem.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro b/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro index 4da949b71a..2aa16751e6 100644 --- a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro +++ b/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicspolygonitem.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro index 7217008317..abe6c23b14 100644 --- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsproxywidget.cpp diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 635fb9b4e6..5b9afe1b1f 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsscene.cpp RESOURCES += images.qrc diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro index 0d0fd0db1a..5e61034d7c 100644 --- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro +++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro @@ -1,5 +1,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,private_tests)) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicssceneindex.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 09b16d7200..0b223c62eb 100644 --- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtGui/qgraphicsscene.h> +#include <QtWidgets/qgraphicsscene.h> #include <private/qgraphicsscenebsptreeindex_p.h> #include <private/qgraphicssceneindex_p.h> #include <private/qgraphicsscenelinearindex_p.h> diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/qgraphicstransform/qgraphicstransform.pro index 67c939ed8b..4f9d001717 100644 --- a/tests/auto/qgraphicstransform/qgraphicstransform.pro +++ b/tests/auto/qgraphicstransform/qgraphicstransform.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgraphicstransform.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro index 4d80caebaf..55569e07bd 100644 --- a/tests/auto/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/qgraphicsview/qgraphicsview.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index e9ddf481af..196519096c 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -51,25 +51,25 @@ #include <math.h> -#include <QtGui/QLabel> +#include <QtWidgets/QLabel> #if !defined(QT_NO_STYLE_MOTIF) -#include <QtGui/QMotifStyle> +#include <QtWidgets/QMotifStyle> #endif #if !defined(QT_NO_STYLE_WINDOWS) -#include <QtGui/QWindowsStyle> +#include <QtWidgets/QWindowsStyle> #endif #if !defined(QT_NO_STYLE_PLASTIQUE) -#include <QtGui/QPlastiqueStyle> +#include <QtWidgets/QPlastiqueStyle> #endif #include <QtGui/QPainterPath> -#include <QtGui/QRubberBand> -#include <QtGui/QScrollBar> -#include <QtGui/QStyleOption> -#include <QtGui/QBoxLayout> -#include <QtGui/QStyle> -#include <QtGui/QPushButton> -#include <QtGui/QInputContext> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QRubberBand> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QStyleOption> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QStyle> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QInputContext> +#include <QtWidgets/QDesktopWidget> #include <private/qgraphicsview_p.h> #include "../../shared/util.h" #include "../platformquirks.h" diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/qgraphicswidget/qgraphicswidget.pro index 4f568eefda..359d606a0b 100644 --- a/tests/auto/qgraphicswidget/qgraphicswidget.pro +++ b/tests/auto/qgraphicswidget/qgraphicswidget.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgraphicswidget.cpp diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/qgridlayout/qgridlayout.pro index d034f1d031..6bd42fe432 100644 --- a/tests/auto/qgridlayout/qgridlayout.pro +++ b/tests/auto/qgridlayout/qgridlayout.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qgridlayout.cpp diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp index 6753f49fed..693236aa9d 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp @@ -46,9 +46,9 @@ #include <qwidget.h> #include <qwindowsstyle.h> #include <qsizepolicy.h> -#include <QtGui> +//#include <QtGui> -#include <QtGui/QWindowsStyle> +#include <QtWidgets/QWindowsStyle> #include <QStyleFactory> #include "../../shared/util.h" diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/qgroupbox/qgroupbox.pro index 5f5370f0cb..f4181a33ed 100644 --- a/tests/auto/qgroupbox/qgroupbox.pro +++ b/tests/auto/qgroupbox/qgroupbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qgroupbox.cpp diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/qheaderview/qheaderview.pro index 9910e4e89d..3b3afa7e49 100644 --- a/tests/auto/qheaderview/qheaderview.pro +++ b/tests/auto/qheaderview/qheaderview.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qheaderview.cpp diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro index 975aaf2973..419be9e3ba 100644 --- a/tests/auto/qicon/qicon.pro +++ b/tests/auto/qicon/qicon.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qicon.cpp RESOURCES = tst_qicon.qrc diff --git a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro index f529e20c7f..7df0e65d03 100644 --- a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro +++ b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro @@ -2,5 +2,6 @@ load(qttest_p4) INCLUDEPATH += $$PWD/../modeltest +QT += widgets SOURCES += tst_qidentityproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro index bf77fb7a2e..7008d34ca7 100644 --- a/tests/auto/qimagereader/qimagereader.pro +++ b/tests/auto/qimagereader/qimagereader.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qimagereader.cpp MOC_DIR=tmp -QT += core-private gui-private network +QT += widgets widgets-private core-private gui-private network RESOURCES += qimagereader.qrc !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro index bab241977b..0fc40d0f0a 100644 --- a/tests/auto/qimagewriter/qimagewriter.pro +++ b/tests/auto/qimagewriter/qimagewriter.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qimagewriter.cpp MOC_DIR=tmp !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro index ec6831e5cf..72626b87b4 100644 --- a/tests/auto/qinputcontext/qinputcontext.pro +++ b/tests/auto/qinputcontext/qinputcontext.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qinputcontext.cpp symbian { diff --git a/tests/auto/qinputdialog/qinputdialog.pro b/tests/auto/qinputdialog/qinputdialog.pro index 2f68a40d91..f7e56bd783 100644 --- a/tests/auto/qinputdialog/qinputdialog.pro +++ b/tests/auto/qinputdialog/qinputdialog.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qinputdialog.cpp diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro index 1206976868..9a1a3b5e94 100644 --- a/tests/auto/qitemdelegate/qitemdelegate.pro +++ b/tests/auto/qitemdelegate/qitemdelegate.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qitemdelegate.cpp win32:!wince*: LIBS += -lUser32 diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp index 772f72b973..82c28b5303 100644 --- a/tests/auto/qitemmodel/modelstotest.cpp +++ b/tests/auto/qitemmodel/modelstotest.cpp @@ -43,7 +43,6 @@ #include <QtTest/QtTest> #include <QtCore/QtCore> #include <QtSql/QtSql> -#include <QtGui/QtGui> #include <QSortFilterProxyModel> /* diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro index b348a183f8..97d55fcd4d 100644 --- a/tests/auto/qitemmodel/qitemmodel.pro +++ b/tests/auto/qitemmodel/qitemmodel.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qitemmodel.cpp -QT += sql +QT += widgets sql # NOTE: The deployment of the sqldrivers is disabled on purpose. # If we deploy the plugins, they are loaded twice when running diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/qkeysequence/qkeysequence.pro index 720c53d627..6cfbe459ea 100644 --- a/tests/auto/qkeysequence/qkeysequence.pro +++ b/tests/auto/qkeysequence/qkeysequence.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qkeysequence.cpp diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro index 4b510cca52..6e9229f83a 100644 --- a/tests/auto/qlabel/qlabel.pro +++ b/tests/auto/qlabel/qlabel.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qlabel.cpp diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro index e84018f0a1..e6813ce164 100644 --- a/tests/auto/qlayout/qlayout.pro +++ b/tests/auto/qlayout/qlayout.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += gui-private +QT += widgets widgets-private SOURCES += tst_qlayout.cpp wince*|symbian: { diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 81b92cadec..ea25700568 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -49,9 +49,9 @@ #include <qdialog.h> #include <qsizegrip.h> #include <qlabel.h> -#include <QtGui/QFrame> -#include <QtGui/QWindowsStyle> -#include <QtGui/QSizePolicy> +#include <QtWidgets/QFrame> +#include <QtWidgets/QWindowsStyle> +#include <QtWidgets/QSizePolicy> #include <QPushButton> #include <QRadioButton> #include <private/qlayoutengine_p.h> diff --git a/tests/auto/qlcdnumber/qlcdnumber.pro b/tests/auto/qlcdnumber/qlcdnumber.pro index 4f1b0091ba..cd909de5be 100644 --- a/tests/auto/qlcdnumber/qlcdnumber.pro +++ b/tests/auto/qlcdnumber/qlcdnumber.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qlcdnumber.cpp diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/qlineedit/qlineedit.pro index bb6d95027b..9a9cb2bfe1 100644 --- a/tests/auto/qlineedit/qlineedit.pro +++ b/tests/auto/qlineedit/qlineedit.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qlineedit.cpp diff --git a/tests/auto/qlistview/qlistview.pro b/tests/auto/qlistview/qlistview.pro index e62ade63c1..6d004fcfc4 100644 --- a/tests/auto/qlistview/qlistview.pro +++ b/tests/auto/qlistview/qlistview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qlistview.cpp win32:!wince*: LIBS += -luser32 diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index 3c4b05bc0f..1c35098152 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -53,9 +53,9 @@ #include <cmath> #endif #include <math.h> -#include <QtGui/QScrollBar> -#include <QtGui/QDialog> -#include <QtGui/QStyledItemDelegate> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QDialog> +#include <QtWidgets/QStyledItemDelegate> #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) #include <windows.h> #endif diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro index eb4c335b5b..51a8e9afd2 100644 --- a/tests/auto/qlistwidget/qlistwidget.pro +++ b/tests/auto/qlistwidget/qlistwidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qlistwidget.cpp diff --git a/tests/auto/qmacstyle/qmacstyle.pro b/tests/auto/qmacstyle/qmacstyle.pro index d80df70694..9534e58bbe 100644 --- a/tests/auto/qmacstyle/qmacstyle.pro +++ b/tests/auto/qmacstyle/qmacstyle.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmacstyle.cpp diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp index 6e03afd575..3c2f71184d 100644 --- a/tests/auto/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtGui> +#include <QtWidgets> #include <qmacstyle_mac.h> diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro index 038686e18c..09633d0e32 100644 --- a/tests/auto/qmainwindow/qmainwindow.pro +++ b/tests/auto/qmainwindow/qmainwindow.pro @@ -1,6 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private SOURCES += tst_qmainwindow.cpp -QT += core-private gui-private # Symbian toolchain does not support correct include semantics symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/qmdisubwindow/qmdisubwindow.pro index 2b93523b22..a40cfd021b 100644 --- a/tests/auto/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/qmdisubwindow/qmdisubwindow.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/qmenu/qmenu.pro index 3a32920b14..089d9d516b 100644 --- a/tests/auto/qmenu/qmenu.pro +++ b/tests/auto/qmenu/qmenu.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmenu.cpp diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/qmenubar/qmenubar.pro index ba2dea8eb7..73c2545710 100644 --- a/tests/auto/qmenubar/qmenubar.pro +++ b/tests/auto/qmenubar/qmenubar.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmenubar.cpp diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/qmessagebox/qmessagebox.pro index a845e2186a..bc1402e615 100644 --- a/tests/auto/qmessagebox/qmessagebox.pro +++ b/tests/auto/qmessagebox/qmessagebox.pro @@ -1,6 +1,7 @@ load(qttest_p4) TEMPLATE = app TARGET = tst_qmessagebox +QT += widgets DEPENDPATH += . INCLUDEPATH += . diff --git a/tests/auto/qmetaobject/qmetaobject.pro b/tests/auto/qmetaobject/qmetaobject.pro index 1df54f73bf..7a4cf94e47 100644 --- a/tests/auto/qmetaobject/qmetaobject.pro +++ b/tests/auto/qmetaobject/qmetaobject.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT = core gui +QT = core gui widgets SOURCES += tst_qmetaobject.cpp diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp index 897664ea9a..3fb60acf57 100644 --- a/tests/auto/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/qmetatype/tst_qmetatype.cpp @@ -255,7 +255,6 @@ void tst_QMetaType::typeName_data() QTest::newRow("double") << QMetaType::Double << "double"; QTest::newRow("qlonglong") << QMetaType::LongLong << "qlonglong"; QTest::newRow("QRegExp") << QMetaType::QRegExp << "QRegExp"; - QTest::newRow("QColorGroup") << QMetaType::Type(63) << "QColorGroup"; QTest::newRow("void*") << QMetaType::VoidStar << "void*"; QTest::newRow("ulong") << QMetaType::ULong << "ulong"; QTest::newRow("QWidget*") << QMetaType::QWidgetStar << "QWidget*"; diff --git a/tests/auto/qmouseevent/qmouseevent.pro b/tests/auto/qmouseevent/qmouseevent.pro index 0e5ddadc1f..58cebd3d06 100644 --- a/tests/auto/qmouseevent/qmouseevent.pro +++ b/tests/auto/qmouseevent/qmouseevent.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmouseevent.cpp diff --git a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro b/tests/auto/qmouseevent_modal/qmouseevent_modal.pro index 33b8eb6954..2f28de2675 100644 --- a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro +++ b/tests/auto/qmouseevent_modal/qmouseevent_modal.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmouseevent_modal.cpp diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro index 855eb9e17a..3e085ceeaf 100644 --- a/tests/auto/qmovie/qmovie.pro +++ b/tests/auto/qmovie/qmovie.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qmovie.cpp MOC_DIR=tmp diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro index 0a1bebcfb6..3e68a44f03 100644 --- a/tests/auto/qpainter/qpainter.pro +++ b/tests/auto/qpainter/qpainter.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += gui-private +QT += widgets widgets-private SOURCES += tst_qpainter.cpp wince*|symbian: { diff --git a/tests/auto/qpalette/qpalette.pro b/tests/auto/qpalette/qpalette.pro index 4ec7876f6a..4b240e5f9c 100644 --- a/tests/auto/qpalette/qpalette.pro +++ b/tests/auto/qpalette/qpalette.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qpalette.cpp diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/qpicture/qpicture.pro index 9979fe3559..eb96b73487 100644 --- a/tests/auto/qpicture/qpicture.pro +++ b/tests/auto/qpicture/qpicture.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qpicture.cpp diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro index f5df30cc1d..fe156d547c 100644 --- a/tests/auto/qpixmap/qpixmap.pro +++ b/tests/auto/qpixmap/qpixmap.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += core-private gui-private +QT += core-private gui-private widgets widgets-private SOURCES += tst_qpixmap.cpp wince*|symbian: { @@ -25,10 +25,6 @@ wince*: { DEPLOYMENT_PLUGIN += qico } else:symbian { LIBS += -lfbscli.dll -lbitgdi.dll -lgdi.dll - contains(QT_CONFIG, openvg) { - LIBS += $$QMAKE_LIBS_OPENVG - QT *= openvg - } } else { DEFINES += SRCDIR=\\\"$$PWD\\\" win32:LIBS += -lgdi32 -luser32 diff --git a/tests/auto/qpixmapfilter/qpixmapfilter.pro b/tests/auto/qpixmapfilter/qpixmapfilter.pro index d52a3c39a3..21e10b7ab9 100644 --- a/tests/auto/qpixmapfilter/qpixmapfilter.pro +++ b/tests/auto/qpixmapfilter/qpixmapfilter.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += gui-private SOURCES += tst_qpixmapfilter.cpp diff --git a/tests/auto/qplaintextedit/qplaintextedit.pro b/tests/auto/qplaintextedit/qplaintextedit.pro index fef1ac83aa..feac5e3f43 100644 --- a/tests/auto/qplaintextedit/qplaintextedit.pro +++ b/tests/auto/qplaintextedit/qplaintextedit.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += gui-private INCLUDEPATH += ../ diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp index 0802f51752..8a423dc933 100644 --- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp @@ -50,7 +50,7 @@ #include <qapplication.h> #include <qclipboard.h> #include <qtextbrowser.h> -#include <private/qtextcontrol_p.h> +#include <private/qwidgettextcontrol_p.h> #include <qscrollbar.h> #include <qtextobject.h> @@ -1136,7 +1136,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations() QCOMPARE(ed.insertCallCount, 0); #ifdef QT_BUILD_INTERNAL - QTextControl *control = qFindChild<QTextControl *>(&ed); + QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed); QVERIFY(control); control->canInsertFromMimeData(QApplication::clipboard()->mimeData()); diff --git a/tests/auto/qpointer/qpointer.pro b/tests/auto/qpointer/qpointer.pro index a30a6fa42b..5728b7bb4f 100644 --- a/tests/auto/qpointer/qpointer.pro +++ b/tests/auto/qpointer/qpointer.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qpointer.cpp diff --git a/tests/auto/qpolygon/qpolygon.pro b/tests/auto/qpolygon/qpolygon.pro index e832666d7c..186b704d17 100644 --- a/tests/auto/qpolygon/qpolygon.pro +++ b/tests/auto/qpolygon/qpolygon.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qpolygon.cpp unix:!mac:!symbian:LIBS+=-lm diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro index ef310b82c8..35bca772b0 100644 --- a/tests/auto/qprinter/qprinter.pro +++ b/tests/auto/qprinter/qprinter.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qprinter.cpp diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 57f79b26db..99ca6fbd58 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -533,11 +533,13 @@ void tst_QPrinter::testMulitpleSets() void tst_QPrinter::changingOutputFormat() { +#if QT_VERSION < 0x050000 QPrinter p; p.setOutputFormat(QPrinter::PostScriptFormat); p.setPageSize(QPrinter::A8); p.setOutputFormat(QPrinter::PdfFormat); QCOMPARE(p.pageSize(), QPrinter::A8); +#endif } void tst_QPrinter::outputFormatFromSuffix() @@ -546,8 +548,6 @@ void tst_QPrinter::outputFormatFromSuffix() QSKIP("No printers available.", SkipAll); QPrinter p; QVERIFY(p.outputFormat() == QPrinter::NativeFormat); - p.setOutputFileName("test.ps"); - QVERIFY(p.outputFormat() == QPrinter::PostScriptFormat); p.setOutputFileName("test.pdf"); QVERIFY(p.outputFormat() == QPrinter::PdfFormat); p.setOutputFileName(QString()); @@ -647,7 +647,7 @@ void tst_QPrinter::testPageMargins() void tst_QPrinter::valuePreservation() { QPrinter::OutputFormat oldFormat = QPrinter::PdfFormat; - QPrinter::OutputFormat newFormat = QPrinter::PostScriptFormat; + QPrinter::OutputFormat newFormat = QPrinter::NativeFormat; // TODO: Correct? { QPrinter printer; diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp index 2c8f5f0e55..90d4d4a962 100644 --- a/tests/auto/qprocess/testGuiProcess/main.cpp +++ b/tests/auto/qprocess/testGuiProcess/main.cpp @@ -38,7 +38,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets/QApplication> +#include <QtWidgets/QLabel> #include <stdio.h> int main(int argc, char **argv) diff --git a/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro b/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro index 15a9e8e4e4..b26a583dee 100644 --- a/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro +++ b/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro @@ -1,4 +1,5 @@ SOURCES += main.cpp +QT += widgets CONFIG += console DESTDIR = ./ diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/qprogressbar/qprogressbar.pro index 6f0d7728fe..70d8c9111f 100644 --- a/tests/auto/qprogressbar/qprogressbar.pro +++ b/tests/auto/qprogressbar/qprogressbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qprogressbar.cpp diff --git a/tests/auto/qprogressdialog/qprogressdialog.pro b/tests/auto/qprogressdialog/qprogressdialog.pro index 3a98d0b017..f3861e4cd3 100644 --- a/tests/auto/qprogressdialog/qprogressdialog.pro +++ b/tests/auto/qprogressdialog/qprogressdialog.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qprogressdialog.cpp diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro index 6d6ddbf65b..4dfd558610 100644 --- a/tests/auto/qpropertyanimation/qpropertyanimation.pro +++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro @@ -1,5 +1,5 @@ load(qttest_p4) -QT = core gui +QT = core gui widgets SOURCES += tst_qpropertyanimation.cpp diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp index f08879e1ce..e344c982c8 100644 --- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp @@ -44,7 +44,7 @@ #include <QtCore/qpropertyanimation.h> #include <QtCore/qvariantanimation.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "../../shared/util.h" //TESTED_CLASS=QPropertyAnimation diff --git a/tests/auto/qpushbutton/qpushbutton.pro b/tests/auto/qpushbutton/qpushbutton.pro index 0d5f9418e1..e2fd455951 100644 --- a/tests/auto/qpushbutton/qpushbutton.pro +++ b/tests/auto/qpushbutton/qpushbutton.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qpushbutton.cpp diff --git a/tests/auto/qradiobutton/qradiobutton.pro b/tests/auto/qradiobutton/qradiobutton.pro index 90e23ab2e0..82b2ff20a8 100644 --- a/tests/auto/qradiobutton/qradiobutton.pro +++ b/tests/auto/qradiobutton/qradiobutton.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qradiobutton.cpp diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/qscrollarea/qscrollarea.pro index bcb2ff347c..5b2602bbdb 100644 --- a/tests/auto/qscrollarea/qscrollarea.pro +++ b/tests/auto/qscrollarea/qscrollarea.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qscrollarea.cpp diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/qscrollbar/qscrollbar.pro index 63a923f881..69c32cbded 100644 --- a/tests/auto/qscrollbar/qscrollbar.pro +++ b/tests/auto/qscrollbar/qscrollbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qscrollbar.cpp diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro index db647a55c5..c947e7a246 100644 --- a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro +++ b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qsharedpointer_and_qwidget.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp index 0bdf6c64cf..90b71c517c 100644 --- a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp +++ b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtGui/QWidget> -#include <QtGui/QPushButton> +#include <QtWidgets/QWidget> +#include <QtWidgets/QPushButton> #include <QtTest/QtTest> QT_BEGIN_NAMESPACE diff --git a/tests/auto/qshortcut/qshortcut.pro b/tests/auto/qshortcut/qshortcut.pro index 61e24b570a..3f68d2377e 100644 --- a/tests/auto/qshortcut/qshortcut.pro +++ b/tests/auto/qshortcut/qshortcut.pro @@ -4,6 +4,7 @@ load(qttest_p4) INCLUDEPATH += ../ # Normal Test Files -------------------------------------------------- +QT += widgets HEADERS += SOURCES += tst_qshortcut.cpp diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro index 3ace4fe8a5..6487d201a4 100644 --- a/tests/auto/qsidebar/qsidebar.pro +++ b/tests/auto/qsidebar/qsidebar.pro @@ -1,6 +1,7 @@ CONFIG += qttest_p4 QT += core-private +QT += widgets widgets-private SOURCES += tst_qsidebar.cpp TARGET = tst_qsidebar diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp index 1104a17654..4a7123567d 100644 --- a/tests/auto/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/qsidebar/tst_qsidebar.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> -#include "../../../src/gui/dialogs/qsidebar_p.h" -#include "../../../src/gui/dialogs/qfilesystemmodel_p.h" +#include "../../../src/widgets/dialogs/qsidebar_p.h" +#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qsignalmapper/qsignalmapper.pro b/tests/auto/qsignalmapper/qsignalmapper.pro index 3215a5943d..5af4b70c63 100644 --- a/tests/auto/qsignalmapper/qsignalmapper.pro +++ b/tests/auto/qsignalmapper/qsignalmapper.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qsignalmapper.cpp diff --git a/tests/auto/qsizegrip/qsizegrip.pro b/tests/auto/qsizegrip/qsizegrip.pro index 7bc43d5283..da6dd5af49 100644 --- a/tests/auto/qsizegrip/qsizegrip.pro +++ b/tests/auto/qsizegrip/qsizegrip.pro @@ -1,5 +1,6 @@ load(qttest_p4) INCLUDEPATH += . +QT += widgets SOURCES += tst_qsizegrip.cpp diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/qslider/qslider.pro index 32fcc81941..41f011649d 100644 --- a/tests/auto/qslider/qslider.pro +++ b/tests/auto/qslider/qslider.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qslider.cpp diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/qspinbox/qspinbox.pro index a65554a087..56a58dadce 100644 --- a/tests/auto/qspinbox/qspinbox.pro +++ b/tests/auto/qspinbox/qspinbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qspinbox.cpp diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro index bca4fc40fd..a0e6878aa9 100644 --- a/tests/auto/qsplitter/qsplitter.pro +++ b/tests/auto/qsplitter/qsplitter.pro @@ -1,7 +1,7 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qsplitter.cpp - wince*|symbian: { addFiles.files = extradata.txt setSizes3.dat addFiles.path = . diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp index e8c6d14f5b..453eb44daa 100644 --- a/tests/auto/qsql/tst_qsql.cpp +++ b/tests/auto/qsql/tst_qsql.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <qapplication.h> +#include <qguiapplication.h> #include <qsqldatabase.h> #include <qsqlerror.h> #include <qsqlquery.h> @@ -117,7 +117,7 @@ void tst_QSql::cleanup() void tst_QSql::basicDriverTest() { int argc = 0; - QApplication app( argc, 0, false ); + QGuiApplication app( argc, 0, false ); tst_Databases dbs; dbs.open(); @@ -187,7 +187,7 @@ void tst_QSql::openInvalid() void tst_QSql::concurrentAccess() { int argc = 0; - QApplication app( argc, 0, false ); + QGuiApplication app( argc, 0, false ); tst_Databases dbs; dbs.open(); @@ -215,7 +215,7 @@ void tst_QSql::concurrentAccess() void tst_QSql::openErrorRecovery() { int argc = 0; - QApplication app( argc, 0, false ); + QGuiApplication app( argc, 0, false ); tst_Databases dbs; dbs.addDbs(); @@ -262,7 +262,7 @@ void tst_QSql::openErrorRecovery() void tst_QSql::registerSqlDriver() { int argc = 0; - QApplication app( argc, 0, false ); + QGuiApplication app( argc, 0, false ); QSqlDatabase::registerSqlDriver( "QSQLTESTDRIVER", new QSqlDriverCreator<QSqlNullDriver> ); QVERIFY( QSqlDatabase::drivers().contains( "QSQLTESTDRIVER" ) ); diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro index 4b23e94715..0664bae6e9 100644 --- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro +++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqlquerymodel.cpp -QT += sql +QT += widgets sql wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/qstackedlayout/qstackedlayout.pro b/tests/auto/qstackedlayout/qstackedlayout.pro index 1fbf5d33db..30f074d9b1 100644 --- a/tests/auto/qstackedlayout/qstackedlayout.pro +++ b/tests/auto/qstackedlayout/qstackedlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qstackedlayout.cpp diff --git a/tests/auto/qstackedwidget/qstackedwidget.pro b/tests/auto/qstackedwidget/qstackedwidget.pro index b0ddc33077..c9436c6a86 100644 --- a/tests/auto/qstackedwidget/qstackedwidget.pro +++ b/tests/auto/qstackedwidget/qstackedwidget.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qstackedwidget.cpp diff --git a/tests/auto/qstandarditem/qstandarditem.pro b/tests/auto/qstandarditem/qstandarditem.pro index 9f22729a7d..1d280fc2f5 100644 --- a/tests/auto/qstandarditem/qstandarditem.pro +++ b/tests/auto/qstandarditem/qstandarditem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qstandarditem.cpp diff --git a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro index 0fc47b3624..8c634b9630 100644 --- a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro +++ b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qstandarditemmodel.cpp diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/qstatemachine/qstatemachine.pro index ab71202f18..c038199bfb 100644 --- a/tests/auto/qstatemachine/qstatemachine.pro +++ b/tests/auto/qstatemachine/qstatemachine.pro @@ -1,4 +1,5 @@ load(qttest_p4) -QT = core core-private gui +QT += widgets +QT += core core-private gui SOURCES += tst_qstatemachine.cpp diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 854e81fb81..08181c17de 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -41,10 +41,10 @@ #include <QtTest/QtTest> #include <QtCore/QCoreApplication> -#include <QtGui/QPushButton> -#include <QtGui/QGraphicsScene> -#include <QtGui/QGraphicsSceneEvent> -#include <QtGui/QGraphicsTextItem> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsSceneEvent> +#include <QtWidgets/QGraphicsTextItem> #include "qstatemachine.h" #include "qstate.h" diff --git a/tests/auto/qstatictext/qstatictext.pro b/tests/auto/qstatictext/qstatictext.pro index 0c16c4c149..c8c36f81f7 100644 --- a/tests/auto/qstatictext/qstatictext.pro +++ b/tests/auto/qstatictext/qstatictext.pro @@ -1,4 +1,5 @@ load(qttest_p4) -QT = core core-private gui gui-private +QT += widgets widgets-private +QT += core core-private gui gui-private SOURCES += tst_qstatictext.cpp diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp index 704f19b72d..4608019218 100644 --- a/tests/auto/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/qstatictext/tst_qstatictext.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QPainter> #include <QtGui/QImage> diff --git a/tests/auto/qstatusbar/qstatusbar.pro b/tests/auto/qstatusbar/qstatusbar.pro index 6c79001af1..51ec0e9cdb 100644 --- a/tests/auto/qstatusbar/qstatusbar.pro +++ b/tests/auto/qstatusbar/qstatusbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qstatusbar.cpp diff --git a/tests/auto/qstringlistmodel/qstringlistmodel.pro b/tests/auto/qstringlistmodel/qstringlistmodel.pro index 9a71d9fc64..fe70ed7345 100644 --- a/tests/auto/qstringlistmodel/qstringlistmodel.pro +++ b/tests/auto/qstringlistmodel/qstringlistmodel.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets HEADERS += qmodellistener.h SOURCES += tst_qstringlistmodel.cpp diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index eb198e28f5..5c949fa56a 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -1,5 +1,6 @@ load(qttest_p4) TARGET.EPOCHEAPSIZE = 0x200000 0x800000 +QT += widgets SOURCES += tst_qstyle.cpp wince*|symbian: { diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/qstyleoption/qstyleoption.pro index 523d9b3946..ccbb39d55b 100644 --- a/tests/auto/qstyleoption/qstyleoption.pro +++ b/tests/auto/qstyleoption/qstyleoption.pro @@ -4,7 +4,7 @@ load(qttest_p4) TEMPLATE = app - +QT += widgets # Input SOURCES += tst_qstyleoption.cpp diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro index 1575616b19..9dc296a51c 100644 --- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += gui-private # Input SOURCES += tst_qstylesheetstyle.cpp diff --git a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro b/tests/auto/qsystemtrayicon/qsystemtrayicon.pro index a77b4788a1..8a6ea3d0a9 100644 --- a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro +++ b/tests/auto/qsystemtrayicon/qsystemtrayicon.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qsystemtrayicon.cpp diff --git a/tests/auto/qtabbar/qtabbar.pro b/tests/auto/qtabbar/qtabbar.pro index 15aa11d9fa..befe5704ba 100644 --- a/tests/auto/qtabbar/qtabbar.pro +++ b/tests/auto/qtabbar/qtabbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtabbar.cpp diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro index 16284b23b4..6e7f8a323a 100644 --- a/tests/auto/qtableview/qtableview.pro +++ b/tests/auto/qtableview/qtableview.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private TARGET.EPOCHEAPSIZE = 0x200000 0x800000 diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/qtablewidget/qtablewidget.pro index d66d0ac67f..0f09203fd1 100644 --- a/tests/auto/qtablewidget/qtablewidget.pro +++ b/tests/auto/qtablewidget/qtablewidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtablewidget.cpp # This prevents the GCCE compile failure: "elf2e32: Error 1063: Fatal Error in diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro index 69296cae2b..1b07543d8a 100644 --- a/tests/auto/qtabwidget/qtabwidget.pro +++ b/tests/auto/qtabwidget/qtabwidget.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += gui-private +QT += widgets widgets-private INCLUDEPATH += ../ diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index cf25bfadc8..3db105d3fe 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -45,7 +45,7 @@ #include <qdebug.h> #include <qapplication.h> #include <qlabel.h> -#include <QtGui/qboxlayout.h> +#include <QtWidgets/qboxlayout.h> //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro index e282de1a2e..6077610a3f 100644 --- a/tests/auto/qtcpsocket/test/test.pro +++ b/tests/auto/qtcpsocket/test/test.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets QT += core-private network-private SOURCES += ../tst_qtcpsocket.cpp win32: { diff --git a/tests/auto/qtextblock/qtextblock.pro b/tests/auto/qtextblock/qtextblock.pro index 5558a71506..d50ef5ca78 100644 --- a/tests/auto/qtextblock/qtextblock.pro +++ b/tests/auto/qtextblock/qtextblock.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qtextblock.cpp diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/qtextblock/tst_qtextblock.cpp index 6477c50758..b04a6f5559 100644 --- a/tests/auto/qtextblock/tst_qtextblock.cpp +++ b/tests/auto/qtextblock/tst_qtextblock.cpp @@ -43,8 +43,9 @@ #include <QtTest/QtTest> -#define private public +#define protected public #include <qtextdocument.h> +#undef protected #include <qdebug.h> #ifndef Q_WS_WIN #include <private/qtextdocument_p.h> @@ -118,9 +119,8 @@ void tst_QTextBlock::fragmentOverBlockBoundaries() // Block separators are always a fragment of their self. Thus: // |Hello|\b|World|\b| #if !defined(Q_WS_WIN) && !defined(Q_WS_S60) - QVERIFY(doc->d_func()->fragmentMap().numNodes() == 4); + QVERIFY(doc->docHandle()->fragmentMap().numNodes() == 4); #endif - QCOMPARE(cursor.block().text(), QString("Hello")); cursor.movePosition(QTextCursor::NextBlock); QCOMPARE(cursor.block().text(), QString("World")); diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/qtextbrowser/qtextbrowser.pro index 415f9cace2..80c18c5dbc 100644 --- a/tests/auto/qtextbrowser/qtextbrowser.pro +++ b/tests/auto/qtextbrowser/qtextbrowser.pro @@ -2,6 +2,7 @@ load(qttest_p4) SOURCES += tst_qtextbrowser.cpp !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" +QT += widgets wince*|symbian: { addFiles.files = *.html diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro index b2dc6a1f68..32b05ce061 100644 --- a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro +++ b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtextdocumentlayout.cpp diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro index 5851763310..56a73f6478 100644 --- a/tests/auto/qtextedit/qtextedit.pro +++ b/tests/auto/qtextedit/qtextedit.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += gui-private +QT += widgets widgets-private gui-private INCLUDEPATH += ../ HEADERS += diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 65158d3d7a..67c610b21a 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -49,7 +49,7 @@ #include <qapplication.h> #include <qclipboard.h> #include <qtextbrowser.h> -#include <private/qtextcontrol_p.h> +#include <private/qwidgettextcontrol_p.h> #include <qscrollbar.h> #include <qtextobject.h> #include <qtexttable.h> @@ -1482,7 +1482,7 @@ void tst_QTextEdit::mimeDataReimplementations() QCOMPARE(ed.insertCallCount, 0); #ifdef QT_BUILD_INTERNAL - QTextControl *control = qFindChild<QTextControl *>(&ed); + QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed); QVERIFY(control); control->canInsertFromMimeData(QApplication::clipboard()->mimeData()); @@ -2093,7 +2093,7 @@ void tst_QTextEdit::cursorRect() void tst_QTextEdit::setDocumentPreservesPalette() { #ifdef QT_BUILD_INTERNAL - QTextControl *control = qFindChild<QTextControl *>(ed); + QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(ed); QVERIFY(control); QPalette defaultPal = ed->palette(); diff --git a/tests/auto/qtextobject/qtextobject.pro b/tests/auto/qtextobject/qtextobject.pro index 1715fa65a3..e87a364ab6 100644 --- a/tests/auto/qtextobject/qtextobject.pro +++ b/tests/auto/qtextobject/qtextobject.pro @@ -3,7 +3,7 @@ ############################################################ load(qttest_p4) - +QT += widgets SOURCES += tst_qtextobject.cpp diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro index edcb0a091c..cfbbe2bca5 100644 --- a/tests/auto/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += core-private gui-private SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp index 1717c6bea6..ddaf84134d 100644 --- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp +++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp @@ -42,9 +42,10 @@ #include <QtTest/QtTest> -#define private public +#define protected public #include <qtextdocument.h> +#undef protected #include <private/qtextdocument_p.h> #include <qabstracttextdocumentlayout.h> #include <qtextobject.h> @@ -124,7 +125,7 @@ tst_QTextPieceTable::tst_QTextPieceTable() void tst_QTextPieceTable::init() { doc = new QTextDocument(0); - table = doc->d_func(); + table = doc->docHandle(); blockFormatIndex = table->formatCollection()->indexForFormat(QTextBlockFormat()); charFormatIndex = table->formatCollection()->indexForFormat(QTextCharFormat()); } diff --git a/tests/auto/qtexttable/qtexttable.pro b/tests/auto/qtexttable/qtexttable.pro index 6ab64bfa94..611b706fc4 100644 --- a/tests/auto/qtexttable/qtexttable.pro +++ b/tests/auto/qtexttable/qtexttable.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtexttable.cpp diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/qtoolbar/qtoolbar.pro index 2c1176fe00..b340097d81 100644 --- a/tests/auto/qtoolbar/qtoolbar.pro +++ b/tests/auto/qtoolbar/qtoolbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets widgets-private QT += gui-private SOURCES += tst_qtoolbar.cpp diff --git a/tests/auto/qtoolbox/qtoolbox.pro b/tests/auto/qtoolbox/qtoolbox.pro index 00c4549ee2..24f3ea6cb9 100644 --- a/tests/auto/qtoolbox/qtoolbox.pro +++ b/tests/auto/qtoolbox/qtoolbox.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtoolbox.cpp diff --git a/tests/auto/qtoolbutton/qtoolbutton.pro b/tests/auto/qtoolbutton/qtoolbutton.pro index d30d092670..5f082682ad 100644 --- a/tests/auto/qtoolbutton/qtoolbutton.pro +++ b/tests/auto/qtoolbutton/qtoolbutton.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtoolbutton.cpp diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/qtooltip/qtooltip.pro index 0bd0e42c48..4a78dfd3de 100644 --- a/tests/auto/qtooltip/qtooltip.pro +++ b/tests/auto/qtooltip/qtooltip.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtooltip.cpp diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro index 0001d1c329..c87af7b733 100644 --- a/tests/auto/qtranslator/qtranslator.pro +++ b/tests/auto/qtranslator/qtranslator.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtranslator.cpp RESOURCES += qtranslator.qrc diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/qtreeview/qtreeview.pro index b7d30bd9cc..9440a660b9 100644 --- a/tests/auto/qtreeview/qtreeview.pro +++ b/tests/auto/qtreeview/qtreeview.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtreeview.cpp diff --git a/tests/auto/qtreewidget/qtreewidget.pro b/tests/auto/qtreewidget/qtreewidget.pro index bc38239c6f..5668be1da7 100644 --- a/tests/auto/qtreewidget/qtreewidget.pro +++ b/tests/auto/qtreewidget/qtreewidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtreewidget.cpp diff --git a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro b/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro index 0af47a3bcc..de7762e773 100644 --- a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro +++ b/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qtreewidgetitemiterator.cpp diff --git a/tests/auto/qundogroup/qundogroup.pro b/tests/auto/qundogroup/qundogroup.pro index 5d5676ded9..f853669d74 100644 --- a/tests/auto/qundogroup/qundogroup.pro +++ b/tests/auto/qundogroup/qundogroup.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += widgets SOURCES += tst_qundogroup.cpp TARGET = tst_qundogroup diff --git a/tests/auto/qundostack/qundostack.pro b/tests/auto/qundostack/qundostack.pro index c7643f9d03..c7f11303f4 100644 --- a/tests/auto/qundostack/qundostack.pro +++ b/tests/auto/qundostack/qundostack.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += widgets SOURCES += tst_qundostack.cpp TARGET = tst_qundostack diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro index 4824c11078..6a56048bd2 100644 --- a/tests/auto/qvariant/qvariant.pro +++ b/tests/auto/qvariant/qvariant.pro @@ -1,3 +1,3 @@ load(qttest_p4) SOURCES += tst_qvariant.cpp -QT += network +QT += widgets network diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro index 50aa08deb4..0024782fff 100644 --- a/tests/auto/qwidget/qwidget.pro +++ b/tests/auto/qwidget/qwidget.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += core-private gui-private +QT += widgets core-private gui-private widgets-private SOURCES += tst_qwidget.cpp RESOURCES = qwidget.qrc diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index eb110a246e..5d4ef00104 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -65,12 +65,12 @@ #include <qdockwidget.h> #include <qtoolbar.h> #include <QtGui/qpaintengine.h> -#include <private/qbackingstore_p.h> +#include <QtGui/qbackingstore.h> #include <qmenubar.h> #include <qtableview.h> -#include <QtGui/QGraphicsView> -#include <QtGui/QGraphicsProxyWidget> +#include <QtWidgets/QGraphicsView> +#include <QtWidgets/QGraphicsProxyWidget> #include "../../shared/util.h" @@ -211,10 +211,6 @@ private slots: void restoreVersion1Geometry_data(); void restoreVersion1Geometry(); - void windowTitle(); - void windowModified(); - void windowIconText(); - void widgetAt(); #ifdef Q_WS_MAC void retainHIView(); @@ -322,7 +318,6 @@ private slots: void updateGeometry(); void updateGeometry_data(); void sendUpdateRequestImmediately(); - void painterRedirection(); void doubleRepaint(); #ifndef Q_WS_MAC void resizeInPaintEvent(); @@ -3234,28 +3229,22 @@ void tst_QWidget::widgetAt() w2->lower(); qApp->processEvents(); - QTRY_VERIFY((wr = QApplication::widgetAt(100, 100))); - const bool match = (wr->objectName() == QString("w1")); + QTRY_VERIFY((wr = QApplication::widgetAt(100, 100)) && wr->objectName() == QString("w1")); w2->raise(); - QVERIFY(match); qApp->processEvents(); - QTRY_VERIFY((wr = QApplication::widgetAt(100, 100))); - QCOMPARE(wr->objectName(), QString("w2")); - + QTRY_VERIFY((wr = QApplication::widgetAt(100, 100)) && wr->objectName() == QString("w2")); QWidget *w3 = new QWidget(w2); w3->setGeometry(10,10,50,50); w3->setObjectName("w3"); w3->show(); qApp->processEvents(); - QTRY_VERIFY((wr = QApplication::widgetAt(100,100))); - QCOMPARE(wr->objectName(), QString("w3")); + QTRY_VERIFY((wr = QApplication::widgetAt(100,100)) && wr->objectName() == QString("w3")); w3->setAttribute(Qt::WA_TransparentForMouseEvents); qApp->processEvents(); - QTRY_VERIFY((wr = QApplication::widgetAt(100, 100))); - QCOMPARE(wr->objectName(), QString("w2")); + QTRY_VERIFY((wr = QApplication::widgetAt(100, 100)) && wr->objectName() == QString("w2")); QRegion rgn = QRect(QPoint(0,0), w2->size()); QPoint point = w2->mapFromGlobal(QPoint(100,100)); @@ -3381,249 +3370,6 @@ static CAknContextPane* ContextPane() } #endif -static QString visibleWindowTitle(QWidget *window, Qt::WindowState state = Qt::WindowNoState) -{ - QString vTitle; - -#ifdef Q_WS_WIN - Q_UNUSED(state); - const size_t maxTitleLength = 256; - wchar_t title[maxTitleLength]; - GetWindowText(window->winId(), title, maxTitleLength); - vTitle = QString::fromWCharArray(title); -#elif defined(Q_WS_X11) - /* - We can't check what the window manager displays, but we can - check what we tell the window manager to display. This will - have to do. - */ - Atom UTF8_STRING = XInternAtom(window->x11Info().display(), "UTF8_STRING", false); - Atom _NET_WM_NAME = XInternAtom(window->x11Info().display(), "_NET_WM_NAME", false); - Atom _NET_WM_ICON_NAME = XInternAtom(window->x11Info().display(), "_NET_WM_ICON_NAME", false); - uchar *data = 0; - ulong length = 0; - if (state == Qt::WindowMinimized) { - if (getProperty(window->x11Info().display(), window->winId(), - UTF8_STRING, _NET_WM_ICON_NAME, &data, &length)) { - vTitle = QString::fromUtf8((char *) data, length); - XFree(data); - } else { - XTextProperty text_prop; - if (XGetWMIconName(window->x11Info().display(), window->winId(), &text_prop)) { - vTitle = textPropertyToString(window->x11Info().display(), text_prop); - XFree((char *) text_prop.value); - } - } - } else { - if (getProperty(window->x11Info().display(), window->winId(), - UTF8_STRING, _NET_WM_NAME, &data, &length)) { - vTitle = QString::fromUtf8((char *) data, length); - XFree(data); - } else { - XTextProperty text_prop; - if (XGetWMName(window->x11Info().display(), window->winId(), &text_prop)) { - vTitle = textPropertyToString(window->x11Info().display(), text_prop); - XFree((char *) text_prop.value); - } - } - } -#elif defined(Q_WS_MAC) - vTitle = nativeWindowTitle(window, state); -#elif defined(Q_WS_QWS) - if (qwsServer) { - const QWSWindow *win = 0; - const QList<QWSWindow*> windows = qwsServer->clientWindows(); - for (int i = 0; i < windows.count(); ++i) { - const QWSWindow* w = windows.at(i); - if (w->winId() == window->winId()) { - win = w; - break; - } - } - if (win) - vTitle = win->caption(); - } -#elif defined (Q_WS_S60) - CAknTitlePane* titlePane = TitlePane(); - if(titlePane) - { - const TDesC* nTitle = titlePane->Text(); - vTitle = QString::fromUtf16(nTitle->Ptr(), nTitle->Length()); - } -#endif - - return vTitle; -} - -void tst_QWidget::windowTitle() -{ - QWidget widget(0); - widget.setWindowTitle("Application Name"); - widget.winId(); // Make sure the window is created... - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowTitle("Application Name *"); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name *")); - - widget.setWindowTitle("Application Name[*]"); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowTitle("Application Name[*][*]"); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*]")); - - widget.setWindowTitle("Application Name[*][*][*]"); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*]")); - - widget.setWindowTitle("Application Name[*][*][*][*]"); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*][*]")); -} - -void tst_QWidget::windowIconText() -{ -#ifdef Q_OS_SYMBIAN - QSKIP("Symbian/S60 windows don't have window icon text", SkipAll); -#endif - QWidget widget(0); - - widget.setWindowTitle("Application Name"); - widget.setWindowIconText("Application Minimized"); - widget.showNormal(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - widget.showMinimized(); -#if defined(Q_WS_QWS) || defined(Q_OS_WINCE) - QEXPECT_FAIL(0, "Qt/Embedded/WinCE does not implement showMinimized()", Continue); - //See task 147193 for WinCE -#endif - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget, Qt::WindowMinimized), - QString("Application Minimized")); - - widget.setWindowTitle("Application Name[*]"); - widget.setWindowIconText("Application Minimized[*]"); - widget.showNormal(); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - widget.showMinimized(); -#if defined (Q_WS_QWS) || defined(Q_OS_WINCE) - QEXPECT_FAIL(0, "Qt/Embedded/WinCE does not implement showMinimized()", Continue); - //See task 147193 for WinCE -#endif - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget, Qt::WindowMinimized), - QString("Application Minimized")); - - widget.setWindowModified(true); - widget.showNormal(); - QApplication::instance()->processEvents(); - if (widget.style()->styleHint(QStyle::SH_TitleBar_ModifyNotification, 0, &widget)) - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name*")); - else - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - widget.showMinimized(); -#if defined (Q_WS_QWS) || defined(Q_OS_WINCE) - QEXPECT_FAIL(0, "Qt/Embedded/WinCE does not implement showMinimized()", Continue); - //See task 147193 for WinCE -#endif - QApplication::instance()->processEvents(); -#ifdef Q_WS_MAC - QCOMPARE(visibleWindowTitle(&widget, Qt::WindowMinimized), - QString("Application Minimized")); - QVERIFY(nativeWindowModified(&widget)); -#else - QCOMPARE(visibleWindowTitle(&widget, Qt::WindowMinimized), - QString("Application Minimized*")); -#endif -} - -void tst_QWidget::windowModified() -{ - QWidget widget(0); - widget.show(); - QTest::qWaitForWindowShown(&widget); -#ifndef Q_WS_MAC - QTest::ignoreMessage(QtWarningMsg, "QWidget::setWindowModified: The window title does not contain a '[*]' placeholder"); -#endif - widget.setWindowTitle("Application Name"); - QTest::qWait(10); - QTRY_COMPARE(visibleWindowTitle(&widget), QString("Application Name")); - -#ifdef Q_WS_MAC - widget.setWindowModified(true); - QVERIFY(nativeWindowModified(&widget)); -#else - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowTitle("Application Name[*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - if (widget.style()->styleHint(QStyle::SH_TitleBar_ModifyNotification, 0, &widget)) - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name*")); - else - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowTitle("Application[*] Name[*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application* Name*")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name")); - - widget.setWindowTitle("Application Name[*][*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*]")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*]")); - - widget.setWindowTitle("Application[*][*] Name[*][*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application[*] Name[*]")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application[*] Name[*]")); - - widget.setWindowTitle("Application[*] Name[*][*][*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application* Name[*]*")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application Name[*]")); - - widget.setWindowTitle("Application[*][*][*] Name[*][*][*]"); - - widget.setWindowModified(true); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application[*]* Name[*]*")); - - widget.setWindowModified(false); - QApplication::instance()->processEvents(); - QCOMPARE(visibleWindowTitle(&widget), QString("Application[*] Name[*]")); -#endif -} - void tst_QWidget::task110173() { QWidget w; @@ -5424,6 +5170,7 @@ void tst_QWidget::showAndMoveChild() QDesktopWidget desktop; QRect desktopDimensions = desktop.availableGeometry(&parent); + desktopDimensions = desktopDimensions.adjusted(64, 64, -64, -64); parent.setGeometry(desktopDimensions); parent.setPalette(Qt::red); @@ -8046,64 +7793,6 @@ void tst_QWidget::sendUpdateRequestImmediately() QCOMPARE(updateWidget.numUpdateRequestEvents, 1); } -class RedirectedWidget : public QWidget -{ -protected: - void paintEvent(QPaintEvent *) - { - // Verify that the widget has a redirection set. The widget is redirected to - // the backing store on all platforms using it; otherwise to itself if the wrect - // does not start in (0, 0) or it has a mask set. - QPaintDevice *oldRedirection = QPainter::redirected(this); -#ifndef Q_WS_MAC - QVERIFY(oldRedirection); -#endif - - QImage image(size(), QImage::Format_RGB32); - image.fill(Qt::blue); - - { - QPainter painter(this); - QCOMPARE(painter.device(), static_cast<QPaintDevice *>(this)); - } - - QPainter::setRedirected(this, &image); - QCOMPARE(QPainter::redirected(this), static_cast<QPaintDevice *>(&image)); - - QPainter painter(this); - painter.fillRect(rect(), Qt::red); - - QPainter::restoreRedirected(this); - QCOMPARE(QPainter::redirected(this), oldRedirection); - - for (int i = 0; i < image.height(); ++i) - for (int j = 0; j < image.width(); ++j) - QCOMPARE(image.pixel(j, i), QColor(Qt::red).rgb()); - } - -}; - -// Test to make sure we're compatible in the particular case where QPainter::setRedirected -// actually works. It has been broken for all other cases since Qt 4.1.4 (backing store). -// QWidget::render is the modern and more powerful way of doing the same. -void tst_QWidget::painterRedirection() -{ - RedirectedWidget widget; - // Set FramelessWindowHint and mask to trigger internal painter redirection on the Mac. - widget.setWindowFlags(widget.windowFlags() | Qt::FramelessWindowHint); - widget.setMask(QRect(10, 10, 50, 50)); - widget.setFixedSize(100, 200); - widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif - QPixmap pixmap(widget.size()); - QPainter::setRedirected(&widget, &pixmap, QPoint()); - widget.repaint(); - QCOMPARE(QPainter::redirected(&widget), static_cast<QPaintDevice *>(&pixmap)); -} - - void tst_QWidget::doubleRepaint() { #ifdef Q_OS_IRIX @@ -9392,7 +9081,7 @@ void tst_QWidget::destroyBackingStore() QTRY_VERIFY(w.numPaintEvents > 0); w.reset(); w.update(); - qt_widget_private(&w)->topData()->backingStore.create(&w); + qt_widget_private(&w)->topData()->backingStoreTracker.create(&w); w.update(); QApplication::processEvents(); @@ -9416,7 +9105,7 @@ QWidgetBackingStore* backingStore(QWidget &widget) QWidgetBackingStore *backingStore = 0; #ifdef QT_BUILD_INTERNAL if (QTLWExtra *topExtra = qt_widget_private(&widget)->maybeTopData()) - backingStore = topExtra->backingStore.data(); + backingStore = topExtra->backingStoreTracker.data(); #endif return backingStore; } @@ -10251,12 +9940,12 @@ class scrollWidgetWBS : public QWidget public: void deleteBackingStore() { - static_cast<QWidgetPrivate*>(d_ptr.data())->topData()->backingStore.destroy(); + static_cast<QWidgetPrivate*>(d_ptr.data())->topData()->backingStoreTracker.destroy(); } void enableBackingStore() { if (!static_cast<QWidgetPrivate*>(d_ptr.data())->maybeBackingStore()) { - static_cast<QWidgetPrivate*>(d_ptr.data())->topData()->backingStore.create(this); + static_cast<QWidgetPrivate*>(d_ptr.data())->topData()->backingStoreTracker.create(this); static_cast<QWidgetPrivate*>(d_ptr.data())->invalidateBuffer(this->rect()); repaint(); } @@ -10487,18 +10176,26 @@ void tst_QWidget::nativeChildFocus() QLineEdit *p2 = new QLineEdit; layout->addWidget(p1); layout->addWidget(p2); +#if 1 p1->setObjectName("p1"); p2->setObjectName("p2"); +#endif w.show(); +#if 1 w.activateWindow(); p1->setFocus(); p1->setAttribute(Qt::WA_NativeWindow); p2->setAttribute(Qt::WA_NativeWindow); QApplication::processEvents(); QTest::qWaitForWindowShown(&w); + QTest::qWait(10); + qDebug() << "checking active window:" << QApplication::activeWindow(); QCOMPARE(QApplication::activeWindow(), &w); QCOMPARE(QApplication::focusWidget(), static_cast<QWidget*>(p1)); +#endif + + QTest::qWait(1000); } QTEST_MAIN(tst_QWidget) diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/qwidget_window/qwidget_window.pro index df7d68739b..dd5837012c 100644 --- a/tests/auto/qwidget_window/qwidget_window.pro +++ b/tests/auto/qwidget_window/qwidget_window.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qwidget_window.cpp x11 { diff --git a/tests/auto/qwidgetaction/qwidgetaction.pro b/tests/auto/qwidgetaction/qwidgetaction.pro index cc80e58fe3..3e037c2efb 100644 --- a/tests/auto/qwidgetaction/qwidgetaction.pro +++ b/tests/auto/qwidgetaction/qwidgetaction.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qwidgetaction.cpp diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro index f236793b91..f1e8bf6070 100644 --- a/tests/auto/qwindowsurface/qwindowsurface.pro +++ b/tests/auto/qwindowsurface/qwindowsurface.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += widgets widgets-private QT += gui-private SOURCES += tst_qwindowsurface.cpp diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index 11f7240ae7..7218921f97 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -45,7 +45,7 @@ #include <QPalette> #include <QWindowsStyle> -#ifndef Q_WS_MAC +#if !defined(Q_WS_MAC) && QT_VERSION < 0x050000 // Fixme Qt 5 #include <private/qwindowsurface_p.h> #include <QDesktopWidget> diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/qwizard/qwizard.pro index a22e45cf19..6d508470c7 100644 --- a/tests/auto/qwizard/qwizard.pro +++ b/tests/auto/qwizard/qwizard.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qwizard.cpp #SOURCES += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.cpp #HEADERS += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.h diff --git a/tests/auto/qworkspace/qworkspace.pro b/tests/auto/qworkspace/qworkspace.pro index de4d29a229..0b8a604fe8 100644 --- a/tests/auto/qworkspace/qworkspace.pro +++ b/tests/auto/qworkspace/qworkspace.pro @@ -1,2 +1,3 @@ load(qttest_p4) +QT += widgets SOURCES += tst_qworkspace.cpp |