diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
| -rw-r--r-- | tools/uilib/abstractformbuilder.cpp | 38 | ||||
| -rw-r--r-- | tools/uilib/abstractformbuilder.h | 2 | ||||
| -rw-r--r-- | tools/uilib/customwidget.h | 2 | ||||
| -rw-r--r-- | tools/uilib/formbuilder.cpp | 1 | ||||
| -rw-r--r-- | tools/uilib/formbuilderextra.cpp | 6 | ||||
| -rw-r--r-- | tools/uilib/formscriptrunner.cpp | 2 | ||||
| -rw-r--r-- | tools/uilib/properties.cpp | 6 | ||||
| -rw-r--r-- | tools/uilib/properties_p.h | 2 | ||||
| -rw-r--r-- | tools/uilib/resourcebuilder.cpp | 2 |
10 files changed, 15 insertions, 48 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7be1e28d57..f241160e26 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -337,7 +337,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "LIBMNG" ] = "auto"; dictionary[ "FREETYPE" ] = "no"; - dictionary[ "QT3SUPPORT" ] = "yes"; + dictionary[ "QT3SUPPORT" ] = "no"; dictionary[ "ACCESSIBILITY" ] = "yes"; dictionary[ "OPENGL" ] = "yes"; dictionary[ "OPENVG" ] = "no"; diff --git a/tools/uilib/abstractformbuilder.cpp b/tools/uilib/abstractformbuilder.cpp index 71c7b8a8ad..7666deba78 100644 --- a/tools/uilib/abstractformbuilder.cpp +++ b/tools/uilib/abstractformbuilder.cpp @@ -56,48 +56,14 @@ #include <QtCore/qdebug.h> #include <QtCore/QCoreApplication> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QButtonGroup> -#include <QtGui/QComboBox> -#include <QtGui/QFontComboBox> -#include <QtGui/QGridLayout> -#ifndef QT_NO_FORMLAYOUT -# include <QtGui/QFormLayout> -#endif -#include <QtGui/QIcon> -#include <QtGui/QListWidget> -#include <QtGui/QMainWindow> -#include <QtGui/QPixmap> -#include <QtGui/QStatusBar> -#include <QtGui/QTreeWidget> -#include <QtGui/QTableWidget> -#include <QtGui/QWidget> -#include <QtGui/QSplitter> -#include <QtGui/QScrollArea> -#include <QtGui/QAbstractButton> -#include <QtGui/QAbstractItemView> -#include <QtGui/QHeaderView> +#include <QtGui/QtGui> +#include <QtWidgets/QtWidgets> #ifndef QFORMINTERNAL_NAMESPACE # include <private/qlayout_p.h> // Compiling within Designer #endif #include <QtXml/QXmlStreamReader> -#include <QtGui/QDialog> - -// containers -#include <QtGui/QToolBox> -#include <QtGui/QStackedWidget> -#include <QtGui/QTabWidget> -#include <QtGui/QToolBar> -#include <QtGui/QMenuBar> -#include <QtGui/QDockWidget> -#include <QtGui/QMdiArea> -#include <QtGui/QWorkspace> -#include <QtGui/QWizard> -#include <QtGui/QWizardPage> - #include <QtCore/qdebug.h> #include <limits.h> diff --git a/tools/uilib/abstractformbuilder.h b/tools/uilib/abstractformbuilder.h index 74d38d2134..d0882500be 100644 --- a/tools/uilib/abstractformbuilder.h +++ b/tools/uilib/abstractformbuilder.h @@ -49,7 +49,7 @@ #include <QtCore/QDir> #include <QtCore/QScopedPointer> -#include <QtGui/QSizePolicy> +#include <QtWidgets/QSizePolicy> #include <QtGui/QPalette> QT_BEGIN_HEADER diff --git a/tools/uilib/customwidget.h b/tools/uilib/customwidget.h index a6899cca89..43cc055046 100644 --- a/tools/uilib/customwidget.h +++ b/tools/uilib/customwidget.h @@ -45,7 +45,7 @@ #include "extension.h" #include <QtCore/QObject> #include <QtCore/QString> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_HEADER diff --git a/tools/uilib/formbuilder.cpp b/tools/uilib/formbuilder.cpp index 4f9a54d422..5e22ddb998 100644 --- a/tools/uilib/formbuilder.cpp +++ b/tools/uilib/formbuilder.cpp @@ -45,6 +45,7 @@ #include "ui4_p.h" #include <QtGui/QtGui> +#include <QtWidgets/QtWidgets> #include <QtCore/QCoreApplication> QT_BEGIN_NAMESPACE diff --git a/tools/uilib/formbuilderextra.cpp b/tools/uilib/formbuilderextra.cpp index c53001825c..3d34a20bff 100644 --- a/tools/uilib/formbuilderextra.cpp +++ b/tools/uilib/formbuilderextra.cpp @@ -45,9 +45,9 @@ #include "textbuilder_p.h" #include "ui4_p.h" -#include <QtGui/QLabel> -#include <QtGui/QBoxLayout> -#include <QtGui/QGridLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QGridLayout> #include <QtCore/QVariant> #include <QtCore/qdebug.h> diff --git a/tools/uilib/formscriptrunner.cpp b/tools/uilib/formscriptrunner.cpp index cf4e1533b8..8efb12f9e3 100644 --- a/tools/uilib/formscriptrunner.cpp +++ b/tools/uilib/formscriptrunner.cpp @@ -44,7 +44,7 @@ #include "ui4_p.h" #include <QtScript/QScriptEngine> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QDebug> #include <QtCore/QCoreApplication> diff --git a/tools/uilib/properties.cpp b/tools/uilib/properties.cpp index ebec22221a..88cd455d65 100644 --- a/tools/uilib/properties.cpp +++ b/tools/uilib/properties.cpp @@ -49,11 +49,11 @@ #include <QtCore/QUrl> #include <QtCore/qdebug.h> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtGui/QPixmap> #include <QtGui/QFont> -#include <QtGui/QFrame> -#include <QtGui/QAbstractScrollArea> +#include <QtWidgets/QFrame> +#include <QtWidgets/QAbstractScrollArea> QT_BEGIN_NAMESPACE diff --git a/tools/uilib/properties_p.h b/tools/uilib/properties_p.h index c6d2781bad..98b84fce9f 100644 --- a/tools/uilib/properties_p.h +++ b/tools/uilib/properties_p.h @@ -60,7 +60,7 @@ #include <QtCore/QLocale> #include <QtCore/QCoreApplication> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include "formbuilderextra_p.h" diff --git a/tools/uilib/resourcebuilder.cpp b/tools/uilib/resourcebuilder.cpp index b24266eada..72921c636b 100644 --- a/tools/uilib/resourcebuilder.cpp +++ b/tools/uilib/resourcebuilder.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtGui/QPixmap> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE |