summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/activeqt/container/qaxselect.cpp14
-rw-r--r--src/activeqt/container/qaxselect.h2
-rw-r--r--src/activeqt/container/qaxwidget.h2
-rw-r--r--src/activeqt/control/qaxaggregated.cpp2
-rw-r--r--src/activeqt/control/qaxbindable.h2
-rw-r--r--src/activeqt/shared/qaxutils.cpp16
-rw-r--r--src/activeqt/shared/qaxutils_p.h6
8 files changed, 23 insertions, 23 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 67c54ee..097d8b9 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.11.1
+MODULE_VERSION = 5.12.0
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 026c86f..81afa51 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -52,13 +52,13 @@
#include "ui_qaxselect.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QSortFilterProxyModel>
-#include <QtCore/QItemSelectionModel>
-#include <QtCore/QSysInfo>
-#include <QtCore/QTextStream>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QPushButton>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qsortfilterproxymodel.h>
+#include <QtCore/qitemselectionmodel.h>
+#include <QtCore/qsysinfo.h>
+#include <QtCore/qtextstream.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qpushbutton.h>
#include <qt_windows.h>
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index 8921a17..54552d9 100644
--- a/src/activeqt/container/qaxselect.h
+++ b/src/activeqt/container/qaxselect.h
@@ -50,7 +50,7 @@
#ifndef QAXSELECT_H
#define QAXSELECT_H
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index 3a9f19e..db1f73a 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -52,7 +52,7 @@
#define QAXWIDGET_H
#include <ActiveQt/qaxbase.h>
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/control/qaxaggregated.cpp b/src/activeqt/control/qaxaggregated.cpp
index 61e858b..0e95308 100644
--- a/src/activeqt/control/qaxaggregated.cpp
+++ b/src/activeqt/control/qaxaggregated.cpp
@@ -51,7 +51,7 @@
#include "qaxaggregated.h"
#ifdef QT_WIDGETS_LIB
-# include <QtWidgets/QWidget>
+# include <QtWidgets/qwidget.h>
#endif
QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h
index d2dcc36..1bb3b0c 100644
--- a/src/activeqt/control/qaxbindable.h
+++ b/src/activeqt/control/qaxbindable.h
@@ -51,7 +51,7 @@
#ifndef QAXBINDABLE_H
#define QAXBINDABLE_H
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
struct IUnknown;
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index c41b321..fb610f5 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -50,19 +50,19 @@
#include "qaxutils_p.h"
-#include <QtWidgets/QWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QRegion>
-#include <QtGui/QWindow>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/qwidget.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qregion.h>
+#include <QtGui/qwindow.h>
+#include <QtGui/qguiapplication.h>
#include <private/qhighdpiscaling_p.h>
#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformpixmap.h>
#include <QtGui/private/qpixmap_raster_p.h>
-#include <QtCore/QScopedArrayPointer>
-#include <QtCore/QRect>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qrect.h>
-#include <QtCore/QDebug>
+#include <QtCore/qdebug.h>
QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/shared/qaxutils_p.h b/src/activeqt/shared/qaxutils_p.h
index 2894a57..21dcfeb 100644
--- a/src/activeqt/shared/qaxutils_p.h
+++ b/src/activeqt/shared/qaxutils_p.h
@@ -63,9 +63,9 @@
//
#include <QtCore/qt_windows.h>
-#include <QtCore/QMetaType>
-#include <QtCore/QPair>
-#include <QtCore/QRect>
+#include <QtCore/qmetatype.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qrect.h>
QT_BEGIN_NAMESPACE