13 files changed, 36 insertions, 33 deletions
diff --git a/src/linguist/linguist/batchtranslationdialog.cpp b/src/linguist/linguist/batchtranslationdialog.cpp
index e58316ff0..decccadfa 100644
--- a/src/linguist/linguist/batchtranslationdialog.cpp
+++ b/src/linguist/linguist/batchtranslationdialog.cpp
@@ -43,8 +43,8 @@
 #include "phrase.h"
 #include "messagemodel.h"
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QProgressDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QProgressDialog>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/batchtranslationdialog.h b/src/linguist/linguist/batchtranslationdialog.h
index 16d70cafe..fa35a4d15 100644
--- a/src/linguist/linguist/batchtranslationdialog.h
+++ b/src/linguist/linguist/batchtranslationdialog.h
@@ -45,8 +45,8 @@
 #include "ui_batchtranslation.h"
 #include "phrase.h"
 
-#include <QtGui/QDialog>
-#include <QtGui/QStandardItemModel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QStandardItemModel>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/errorsview.cpp b/src/linguist/linguist/errorsview.cpp
index f24b3bede..8aa94858b 100644
--- a/src/linguist/linguist/errorsview.cpp
+++ b/src/linguist/linguist/errorsview.cpp
@@ -47,11 +47,11 @@
 #include <QtCore/QString>
 #include <QtCore/QUrl>
 
-#include <QtGui/QListView>
-#include <QtGui/QStandardItem>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QTextEdit>
-#include <QtGui/QVBoxLayout>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QStandardItem>
+#include <QtWidgets/QStandardItemModel>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QVBoxLayout>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp
index a2a600257..7ad28454a 100644
--- a/src/linguist/linguist/formpreviewview.cpp
+++ b/src/linguist/linguist/formpreviewview.cpp
@@ -48,19 +48,19 @@
 #include <QtCore/QDebug>
 #include <QtCore/QTime>
 
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QFontComboBox>
-#include <QtGui/QFrame>
-#include <QtGui/QGridLayout>
-#include <QtGui/QListWidget>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QTableWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QToolBox>
-#include <QtGui/QTreeWidget>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QMdiSubWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QTreeWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/formpreviewview.h b/src/linguist/linguist/formpreviewview.h
index e30160670..15fafc4b7 100644
--- a/src/linguist/linguist/formpreviewview.h
+++ b/src/linguist/linguist/formpreviewview.h
@@ -47,7 +47,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index 46aad5f07..db68e9130 100644
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -4,7 +4,7 @@ TEMPLATE = app
 LANGUAGE = C++
 DESTDIR = $$QT.designer.bins
 
-QT += core-private xml designer
+QT += core-private widgets xml designer
 
 CONFIG += qt \
     warn_on \
diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp
index c1388e198..07e4768d3 100644
--- a/src/linguist/linguist/main.cpp
+++ b/src/linguist/linguist/main.cpp
@@ -49,10 +49,10 @@
 #include <QtCore/QTextCodec>
 #include <QtCore/QTranslator>
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
 #include <QtGui/QPixmap>
-#include <QtGui/QSplashScreen>
+#include <QtWidgets/QSplashScreen>
 
 QT_USE_NAMESPACE
 
diff --git a/src/linguist/linguist/mainwindow.h b/src/linguist/linguist/mainwindow.h
index fe9daf264..1c90c42e6 100644
--- a/src/linguist/linguist/mainwindow.h
+++ b/src/linguist/linguist/mainwindow.h
@@ -50,7 +50,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QLocale>
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/messageeditor.h b/src/linguist/linguist/messageeditor.h
index 875ef3303..410f253f3 100644
--- a/src/linguist/linguist/messageeditor.h
+++ b/src/linguist/linguist/messageeditor.h
@@ -47,8 +47,8 @@
 #include <QtCore/QLocale>
 #include <QtCore/QTimer>
 
-#include <QtGui/QFrame>
-#include <QtGui/QScrollArea>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QScrollArea>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/linguist/linguist/messagehighlighter.cpp b/src/linguist/linguist/messagehighlighter.cpp
index bef2d6221..0191d4cab 100644
--- a/src/linguist/linguist/messagehighlighter.cpp
+++ b/src/linguist/linguist/messagehighlighter.cpp
@@ -42,11 +42,12 @@
 #include "messagehighlighter.h"
 
 #include <QtCore/QTextStream>
+#include <QtWidgets/QTextEdit>
 
 QT_BEGIN_NAMESPACE
 
 MessageHighlighter::MessageHighlighter(QTextEdit *textEdit)
-    : QSyntaxHighlighter(textEdit)
+    : QSyntaxHighlighter(textEdit->document())
 {
     QTextCharFormat entityFormat;
     entityFormat.setForeground(Qt::red);
diff --git a/src/linguist/linguist/messagehighlighter.h b/src/linguist/linguist/messagehighlighter.h
index 455140f61..f041ac7fd 100644
--- a/src/linguist/linguist/messagehighlighter.h
+++ b/src/linguist/linguist/messagehighlighter.h
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QTextEdit;
+
 /* Message highlighter based on HtmlSyntaxHighlighter from designer */
 class MessageHighlighter : public QSyntaxHighlighter
 {
diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp
index 2d126577c..f90a3167f 100644
--- a/src/linguist/linguist/messagemodel.cpp
+++ b/src/linguist/linguist/messagemodel.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QTextCodec>
 
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 #include <QtGui/QTextDocument>
diff --git a/src/linguist/linguist/translationsettingsdialog.h b/src/linguist/linguist/translationsettingsdialog.h
index 9eee406fa..083bc8ebd 100644
--- a/src/linguist/linguist/translationsettingsdialog.h
+++ b/src/linguist/linguist/translationsettingsdialog.h
@@ -45,7 +45,7 @@
 #include "ui_translationsettings.h"
 
 #include <QtCore/QLocale>
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE