12 files changed, 15 insertions, 13 deletions
diff --git a/src/imports/etcprovider/qetcprovider.cpp b/src/imports/etcprovider/qetcprovider.cpp
index 3e76c017a4..053258a794 100644
--- a/src/imports/etcprovider/qetcprovider.cpp
+++ b/src/imports/etcprovider/qetcprovider.cpp
@@ -44,7 +44,8 @@
 #include <QtDebug>
 #include <QFile>
 
-#include <qglfunctions.h>
+#include <qopenglfunctions.h>
+#include <qopenglcontext.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -118,7 +119,7 @@ void EtcTexture::bind()
                 "paddedWidth: " << m_paddedSize.width() << "paddedHeight: " << m_paddedSize.height();
 #endif
 
-    const QGLContext *ctx = QGLContext::currentContext();
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
     Q_ASSERT(ctx != 0);
     ctx->functions()->glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_ETC1_RGB8_OES,
                                              m_size.width(), m_size.height(), 0,
diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h
index a34b458b70..46ec421162 100644
--- a/src/imports/etcprovider/qetcprovider.h
+++ b/src/imports/etcprovider/qetcprovider.h
@@ -42,7 +42,7 @@
 #ifndef QETCPROVIDER_H
 #define QETCPROVIDER_H
 
-#include <qgl.h>
+#include <qopengl.h>
 #include <QDeclarativeImageProvider>
 #include <QSGTexture>
 #include <QDeclarativeEngine>
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 45483fc810..e7095956b2 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -2,7 +2,7 @@ TARGET  = qmlgesturesplugin
 TARGETPATH = Qt/labs/gestures
 include(../qimportbase.pri)
 
-QT += core-private gui-private v8-private declarative-private qtquick1 qtquick1-private
+QT += core-private gui-private declarative-private qtquick1 qtquick1-private widgets-private v8-private
 
 SOURCES += qdeclarativegesturearea.cpp plugin.cpp
 HEADERS += qdeclarativegesturearea_p.h
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 64da7f9a11..802703c767 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -48,7 +48,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qgesture.h>
+#include <QtWidgets/qgesture.h>
 
 #ifndef QT_NO_GESTURES
 
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index c60e72db08..6096ad7a6a 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures inputcontext etcprovider
-contains(QT_CONFIG, qmltest): SUBDIRS += testlib
+# ### refactor: port properly
+# contains(QT_CONFIG, qmltest): SUBDIRS += testlib
 
diff --git a/src/imports/inputcontext/declarativeinputcontext.h b/src/imports/inputcontext/declarativeinputcontext.h
index 757c6c43ed..9e6e65fd6e 100644
--- a/src/imports/inputcontext/declarativeinputcontext.h
+++ b/src/imports/inputcontext/declarativeinputcontext.h
@@ -42,7 +42,7 @@
 #ifndef DECLARATIVEINPUTCONTEXT_H
 #define DECLARATIVEINPUTCONTEXT_H
 
-#include <QtGui/qinputcontext.h>
+#include <QtWidgets/qinputcontext.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/inputcontext/inputcontext.pro b/src/imports/inputcontext/inputcontext.pro
index cbad82c5b1..c8641d20e3 100755
--- a/src/imports/inputcontext/inputcontext.pro
+++ b/src/imports/inputcontext/inputcontext.pro
@@ -2,7 +2,7 @@ TARGET  = qmlinputcontextplugin
 TARGETPATH = Qt/labs/inputcontext
 include(../qimportbase.pri)
 
-QT += declarative
+QT += declarative widgets
 
 SOURCES += \
         declarativeinputcontext.cpp \
diff --git a/src/imports/inputcontext/inputcontextfilter.cpp b/src/imports/inputcontext/inputcontextfilter.cpp
index 656a869a88..be89841b85 100644
--- a/src/imports/inputcontext/inputcontextfilter.cpp
+++ b/src/imports/inputcontext/inputcontextfilter.cpp
@@ -43,7 +43,7 @@
 
 #include "declarativeinputcontext.h"
 
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/inputcontext/inputcontextmodule.cpp b/src/imports/inputcontext/inputcontextmodule.cpp
index d5f9161c0c..578fb98733 100644
--- a/src/imports/inputcontext/inputcontextmodule.cpp
+++ b/src/imports/inputcontext/inputcontextmodule.cpp
@@ -44,9 +44,9 @@
 #include "declarativeinputcontext.h"
 
 #include <QtCore/qdebug.h>
-#include <QtGui/qapplication.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qtextformat.h>
+#include <QtWidgets/qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/inputcontext/plugin.cpp b/src/imports/inputcontext/plugin.cpp
index 5ce9e5b475..70fed2e241 100644
--- a/src/imports/inputcontext/plugin.cpp
+++ b/src/imports/inputcontext/plugin.cpp
@@ -44,7 +44,7 @@
 #include "inputcontextmodule.h"
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/particles/V1/qdeclarativeparticles.cpp b/src/imports/particles/V1/qdeclarativeparticles.cpp
index f307109ee8..92248347aa 100644
--- a/src/imports/particles/V1/qdeclarativeparticles.cpp
+++ b/src/imports/particles/V1/qdeclarativeparticles.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/QAbstractAnimation>
 
 #include <QPainter>
-#include <QtGui/qdrawutil.h>
+#include <QtWidgets/qdrawutil.h>
 #include <QVarLengthArray>
 
 #include <stdlib.h>
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index e054796d25..74dab8dcf3 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -9,7 +9,7 @@ SOURCES += \
     particles.cpp \
     V1/qdeclarativeparticles.cpp 
 
-QT += declarative opengl core gui v8-private declarative-private core-private gui-private qtquick1 qtquick1-private
+QT += declarative opengl core gui declarative-private core-private gui-private qtquick1 qtquick1-private widgets-private v8-private
 
 OTHER_FILES += \
     qmldir