diff options
42 files changed, 98 insertions, 94 deletions
diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index 14d3e9a..c1aebe4 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -1,4 +1,4 @@ -QT += script +QT += script widgets CONFIG += uitools RESOURCES += calculator.qrc SOURCES += main.cpp diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index de1287a..7ce9623 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -1,5 +1,5 @@ TEMPLATE = app -QT += script +QT += widgets script # Input HEADERS += qcontext2dcanvas.h \ context2d.h \ diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro index 590ae8d..0685673 100644 --- a/examples/script/defaultprototypes/defaultprototypes.pro +++ b/examples/script/defaultprototypes/defaultprototypes.pro @@ -1,4 +1,4 @@ -QT += script +QT += widgets script RESOURCES += defaultprototypes.qrc SOURCES += main.cpp prototypes.cpp HEADERS += prototypes.h diff --git a/examples/script/defaultprototypes/main.cpp b/examples/script/defaultprototypes/main.cpp index 8fc17e3..71c7ca7 100644 --- a/examples/script/defaultprototypes/main.cpp +++ b/examples/script/defaultprototypes/main.cpp @@ -38,7 +38,8 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets/QListWidgetItem> +#include <QtWidgets/QApplication> #include <QtScript> #include "prototypes.h" diff --git a/examples/script/defaultprototypes/prototypes.cpp b/examples/script/defaultprototypes/prototypes.cpp index 15c2661..4cb38a8 100644 --- a/examples/script/defaultprototypes/prototypes.cpp +++ b/examples/script/defaultprototypes/prototypes.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include "prototypes.h" -#include <QtGui/QListWidgetItem> -#include <QtGui/QListWidget> +#include <QtWidgets/QListWidgetItem> +#include <QtWidgets/QListWidget> #include <QtScript/QScriptValue> #include <QtScript/QScriptEngine> #include <QDebug> diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro index 5bfbc86..d3ce7c0 100644 --- a/examples/script/helloscript/helloscript.pro +++ b/examples/script/helloscript/helloscript.pro @@ -1,4 +1,4 @@ -QT += script +QT += widgets script RESOURCES += helloscript.qrc SOURCES += main.cpp diff --git a/examples/script/qscript/main.cpp b/examples/script/qscript/main.cpp index a8d93d0..b745ee0 100644 --- a/examples/script/qscript/main.cpp +++ b/examples/script/qscript/main.cpp @@ -44,7 +44,7 @@ #include <QtCore/QFile> #include <QtCore/QTextStream> #include <QtCore/QStringList> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <stdlib.h> diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro index 8005751..d9881a7 100644 --- a/examples/script/qscript/qscript.pro +++ b/examples/script/qscript/qscript.pro @@ -1,5 +1,5 @@ -QT += script +QT += widgets script win32: CONFIG += console mac:CONFIG -= app_bundle diff --git a/examples/script/qstetrix/main.cpp b/examples/script/qstetrix/main.cpp index 1ecad97..366c7a0 100644 --- a/examples/script/qstetrix/main.cpp +++ b/examples/script/qstetrix/main.cpp @@ -40,7 +40,10 @@ #include "tetrixboard.h" -#include <QtGui> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QAction> #include <QtScript> #include <QUiLoader> diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro index 4a99a0a..fad66ce 100644 --- a/examples/script/qstetrix/qstetrix.pro +++ b/examples/script/qstetrix/qstetrix.pro @@ -1,4 +1,4 @@ -QT += script +QT += widgets script CONFIG += uitools HEADERS = tetrixboard.h diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp index 82a817f..47088d4 100644 --- a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp +++ b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp @@ -48,7 +48,7 @@ #include <QtCore/qpair.h> #include <QtCore/qcoreapplication.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp index c46cfb5..c9edf34 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp @@ -45,16 +45,16 @@ #include "qscriptdebuggerscriptsmodel_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qaction.h> -#include <QtGui/qcompleter.h> -#include <QtGui/qheaderview.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qmessagebox.h> -#include <QtGui/qtoolbar.h> -#include <QtGui/qtoolbutton.h> -#include <QtGui/qtreeview.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qstyleditemdelegate.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qcompleter.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qmessagebox.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qstyleditemdelegate.h> #include <QtGui/qevent.h> #include <QtScript/qscriptengine.h> diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h index ccf8d51..71c3465 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index dc3a3bb..6f01a00 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -86,13 +86,13 @@ #include <QtCore/qstringlist.h> #include <QtCore/qdebug.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> #include <QtGui/qevent.h> -#include <QtGui/qicon.h> -#include <QtGui/qinputdialog.h> -#include <QtGui/qmenu.h> -#include <QtGui/qtoolbar.h> -#include <QtGui/qtooltip.h> +#include <QtWidgets/qicon.h> +#include <QtWidgets/qinputdialog.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qtooltip.h> QT_BEGIN_NAMESPACE typedef QPair<QList<qint64>, QList<qint64> > QScriptScriptsDelta; diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp index af1653f..da7678b 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp @@ -42,11 +42,11 @@ #include "qscriptdebuggercodefinderwidget_p.h" #include "qscriptdebuggercodefinderwidgetinterface_p_p.h" -#include <QtGui/qboxlayout.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qcheckbox.h> -#include <QtGui/qlabel.h> -#include <QtGui/qtoolbutton.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qcheckbox.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qtoolbutton.h> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h index 16bfeeb..d40fb5b 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qtextdocument.h> diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp index 7c99723..5655615 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp @@ -44,7 +44,7 @@ #include "qscriptedit_p.h" -#include <QtGui/qboxlayout.h> +#include <QtWidgets/qboxlayout.h> #include <QtGui/qtextobject.h> #include <QtCore/qdebug.h> diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h index e8bdae6..f9f619b 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp index c163b32..3f1a77a 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp @@ -47,8 +47,8 @@ #include "qscripttooltipproviderinterface_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qstackedwidget.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qstackedwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h index a2272d7..e30d097 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp index 7a21043..0c34a97 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp @@ -46,13 +46,13 @@ #include "qscriptcompletiontaskinterface_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qplaintextedit.h> -#include <QtGui/qlabel.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qlistview.h> -#include <QtGui/qscrollbar.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qcompleter.h> +#include <QtWidgets/qplaintextedit.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qlistview.h> +#include <QtWidgets/qscrollbar.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qcompleter.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h index 3252817..956902d 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "qscriptmessagehandlerinterface_p.h" diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index 7a2b8ae..7cd55ec 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -46,16 +46,16 @@ #include "qscriptcompletiontaskinterface_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qheaderview.h> -#include <QtGui/qcompleter.h> -#include <QtGui/qstringlistmodel.h> -#include <QtGui/qtreeview.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qsortfilterproxymodel.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qstyleditemdelegate.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qcompleter.h> +#include <QtWidgets/qstringlistmodel.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qsortfilterproxymodel.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qstyleditemdelegate.h> #include <QtGui/qevent.h> -#include <QtGui/qmessagebox.h> +#include <QtWidgets/qmessagebox.h> #include <QtScript/qscriptengine.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h index 1835dd6..4dcd8fe 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp index a247068..5a3cfbe 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp @@ -44,9 +44,9 @@ #include "qscriptdebuggerscriptsmodel_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qheaderview.h> -#include <QtGui/qtreeview.h> -#include <QtGui/qboxlayout.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qboxlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h index 847d95e..9324f4a 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp index 94cfef0..5fbbc8b 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp @@ -43,9 +43,9 @@ #include "qscriptdebuggerstackwidgetinterface_p_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qheaderview.h> -#include <QtGui/qtreeview.h> -#include <QtGui/qboxlayout.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qboxlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h index ca61b25..04478d8 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp index bb13d24..edbe7a7 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp +++ b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp @@ -43,9 +43,9 @@ #include "qscriptdebugoutputwidgetinterface_p_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qplaintextedit.h> -#include <QtGui/qscrollbar.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qplaintextedit.h> +#include <QtWidgets/qscrollbar.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h index 84f8fa8..5eb96ed 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "qscriptmessagehandlerinterface_p.h" diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index fe5e841..e5074af 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -43,13 +43,13 @@ #include "qscriptsyntaxhighlighter_p.h" #include <QtGui/qpainter.h> -#include <QtGui/qicon.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qlabel.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qmenu.h> -#include <QtGui/qaction.h> -#include <QtGui/qwidgetaction.h> +#include <QtWidgets/qicon.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qwidgetaction.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptedit_p.h b/src/scripttools/debugging/qscriptedit_p.h index 5d4eb45..6eb9d0d 100644 --- a/src/scripttools/debugging/qscriptedit_p.h +++ b/src/scripttools/debugging/qscriptedit_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qplaintextedit.h> +#include <QtWidgets/qplaintextedit.h> #include <QtCore/qhash.h> #include <QtCore/qset.h> diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index 7d300f8..4588dc6 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -46,11 +46,11 @@ #include <private/qobject_p.h> #include <QtCore/qsettings.h> -#include <QtGui/qapplication.h> -#include <QtGui/qdockwidget.h> -#include <QtGui/qmainwindow.h> -#include <QtGui/qmenubar.h> -#include <QtGui/qboxlayout.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qdockwidget.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qboxlayout.h> // this has to be outside the namespace static void initScriptEngineDebuggerResources() diff --git a/src/scripttools/debugging/qscripterrorlogwidget.cpp b/src/scripttools/debugging/qscripterrorlogwidget.cpp index 935f427..34f4e77 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget.cpp +++ b/src/scripttools/debugging/qscripterrorlogwidget.cpp @@ -43,9 +43,9 @@ #include "qscripterrorlogwidgetinterface_p_p.h" #include <QtCore/qdatetime.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qtextedit.h> -#include <QtGui/qscrollbar.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qscrollbar.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h index 2cbcd0d..c92e38d 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include "qscriptmessagehandlerinterface_p.h" diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 8e12c5d..9ced50b 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = QtScriptTools QPRO_PWD = $$PWD -QT = core-private gui-private script +QT = core-private gui widgets widgets-private script CONFIG += module MODULE_PRI = ../../modules/qt_scripttools.pri diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index d99f2d8..3769354 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -1,5 +1,5 @@ load(qttest_p4) -QT = core gui script script-private +QT = core gui widgets script script-private SOURCES += tst_qscriptengine.cpp RESOURCES += qscriptengine.qrc diff --git a/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro b/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro index 6b504ec..26f4b12 100644 --- a/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro +++ b/tests/auto/qscriptenginedebugger/qscriptenginedebugger.pro @@ -1,3 +1,3 @@ load(qttest_p4) -QT += script scripttools +QT += script widgets scripttools SOURCES += tst_qscriptenginedebugger.cpp diff --git a/tests/auto/qscriptextqobject/qscriptextqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro index 140a4e6..6d2f652 100644 --- a/tests/auto/qscriptextqobject/qscriptextqobject.pro +++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro @@ -1,3 +1,3 @@ load(qttest_p4) -QT = core gui script +QT = core gui widgets script SOURCES += tst_qscriptextqobject.cpp diff --git a/tests/auto/qscriptvalue/qscriptvalue.pro b/tests/auto/qscriptvalue/qscriptvalue.pro index 0474c32..c326fbf 100644 --- a/tests/auto/qscriptvalue/qscriptvalue.pro +++ b/tests/auto/qscriptvalue/qscriptvalue.pro @@ -1,5 +1,5 @@ load(qttest_p4) -QT = core gui script +QT = core gui widgets script SOURCES += tst_qscriptvalue.cpp HEADERS += tst_qscriptvalue.h diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 6779d9b..9792e02 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "tst_qscriptvalue.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp index 41e2601..4cc9d6b 100644 --- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "tst_qscriptvalue.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> //TESTED_CLASS= //TESTED_FILES= |