Merge pull request #1973 from pullmoll/qupzilla

qupzilla: fixes for Qt5-5.5.0
This commit is contained in:
Jürgen Buchmüller 2015-07-06 19:02:40 +02:00
commit e028ad6ffd
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,12 @@
Include QDataStream for the required definitions
--- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-01-26 15:26:15.000000000 +0100
+++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-07-06 18:32:29.862136464 +0200
@@ -48,6 +48,7 @@
#include "qtlocalpeer.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QTime>
+#include <QtCore/QDataStream>
#if defined(Q_OS_WIN)
#include <QtCore/QLibrary>

View file

@ -0,0 +1,12 @@
Include QObject for the required definitions
--- src/plugins/TabManager/tldextractor/tldextractor.h 2015-01-26 15:26:15.000000000 +0100
+++ src/plugins/TabManager/tldextractor/tldextractor.h 2015-07-06 18:41:27.630175234 +0200
@@ -20,6 +20,7 @@
#define TLDExtractor_Version "1.0"
#include <QHash>
+#include <QObject>
#include <QStringList>