Another set of fixes for qt5 without webkit

psi-im · Apr 25, 2017 · 853a291 · 853a291
1 parent 39b58ca
commit 853a291
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
@@ -23,9 +23,6 @@
 
 #include "bytearrayreply.h"
 #include <QCoreApplication>
-#ifndef WEBENGINE
-#include <QWebSecurityOrigin>
-#endif
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent) :
     QNetworkAccessManager(parent)

diff --git a/src/psicon.cpp b/src/psicon.cpp
@@ -86,10 +86,10 @@
 #include "groupchatdlg.h"
 #endif
 #include "spellchecker/aspellchecker.h"
+#include "networkaccessmanager.h"
 #ifdef WEBKIT
 #include "avatars.h"
 #include "chatviewthemeprovider.h"
-#include "networkaccessmanager.h"
 #include "webview.h"
 #endif
 #include "urlobject.h"

diff --git a/src/src.pri b/src/src.pri
@@ -556,12 +556,16 @@ pgputil {
 HEADERS += \
 	$$PWD/removeconfirmationmessagebox.h \
 	$$PWD/globaleventqueue.h \
-	$$PWD/dummystream.h
+	$$PWD/dummystream.h \
+	$$PWD/networkaccessmanager.h \
+	$$PWD/bytearrayreply.h \
 
 SOURCES += \
 	$$PWD/removeconfirmationmessagebox.cpp \
 	$$PWD/globaleventqueue.cpp \
-	$$PWD/dummystream.cpp
+	$$PWD/dummystream.cpp \
+	$$PWD/networkaccessmanager.cpp \
+	$$PWD/bytearrayreply.cpp \
 
 # Qt Designer forms
 FORMS += \
@@ -641,17 +645,13 @@ unix:!dbus {
 
 qtwebengine|qwebkit {
 	HEADERS += 	$$PWD/chatview_webkit.h \
-			$$PWD/networkaccessmanager.h \
-			$$PWD/bytearrayreply.h \
 			$$PWD/webview.h \
 			$$PWD/jsutil.h \
 			$$PWD/chatviewtheme.h \
 			$$PWD/chatviewthemeprovider.h \
 			$$PWD/chatviewthemeprovider_priv.h
 
 	SOURCES += 	$$PWD/chatview_webkit.cpp \
-			$$PWD/networkaccessmanager.cpp \
-			$$PWD/bytearrayreply.cpp \
 			$$PWD/webview.cpp \
 			$$PWD/jsutil.cpp \
 			$$PWD/chatviewtheme.cpp \