diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-09-16 10:50:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-23 12:26:52 +0200 |
| commit | 0e1372d95939d3bd3889100fbec10036d7a83f1f (patch) | |
| tree | a86a53db4ff36857a1373265b896745d538ce98f /src | |
| parent | b2a329d3e136a847a352b5f894ce27bd38abe61c (diff) | |
Fix compilation after 757a9c21c1 in base
Adaptations for the following qtbase changes:
- acbf9a858b Cleanup QTypeInfo
- 652bd1efca Make QStringList an alias to QList<QString>
- 25351dcc54 Long live QKeyCombination!
- ed8acbeb7c Automatically register data/debug stream operations in QMetaType
- a735038376 Move QStateMachine from QtCore to QtScxml
Change-Id: Ieb2677cd0572cc6dfe7be4b8f8dd4189a39bd3fe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/api/qwebenginecallback_p.h | 2 | ||||
| -rw-r--r-- | src/core/pref_service_adapter.h | 2 | ||||
| -rw-r--r-- | src/core/profile_qt.h | 1 | ||||
| -rw-r--r-- | src/pdfwidgets/qpdfview_p.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/core/api/qwebenginecallback_p.h b/src/core/api/qwebenginecallback_p.h index 133a86f6d..9cc25b7fd 100644 --- a/src/core/api/qwebenginecallback_p.h +++ b/src/core/api/qwebenginecallback_p.h @@ -244,7 +244,7 @@ inline void CallbackDirectory::CallbackSharedDataPointer<T>::invokeEmpty() parent->invokeEmptyInternal(callback); } -#define CHECK_RELOCATABLE(x) Q_STATIC_ASSERT((QTypeInfoQuery<QWebEngineCallback<x>>::isRelocatable)); +#define CHECK_RELOCATABLE(x) Q_STATIC_ASSERT((QTypeInfo<QWebEngineCallback<x>>::isRelocatable)); FOR_EACH_TYPE(CHECK_RELOCATABLE) #undef CHECK_RELOCATABLE diff --git a/src/core/pref_service_adapter.h b/src/core/pref_service_adapter.h index 5c4c6e92a..93a61302f 100644 --- a/src/core/pref_service_adapter.h +++ b/src/core/pref_service_adapter.h @@ -44,8 +44,6 @@ #include "components/prefs/pref_service.h" #include "qtwebenginecoreglobal_p.h" -QT_FORWARD_DECLARE_CLASS(QStringList) - namespace QtWebEngineCore { class ProfileAdapter; diff --git a/src/core/profile_qt.h b/src/core/profile_qt.h index df84136bc..11b567b97 100644 --- a/src/core/profile_qt.h +++ b/src/core/profile_qt.h @@ -48,7 +48,6 @@ #include "profile_io_data_qt.h" #include <QtGlobal> -QT_FORWARD_DECLARE_CLASS(QStringList) class InMemoryPrefStore; class PrefService; diff --git a/src/pdfwidgets/qpdfview_p.h b/src/pdfwidgets/qpdfview_p.h index 7e758832c..d6b3f0345 100644 --- a/src/pdfwidgets/qpdfview_p.h +++ b/src/pdfwidgets/qpdfview_p.h @@ -50,6 +50,7 @@ #include "qpdfview.h" +#include <QHash> #include <QPointer> QT_BEGIN_NAMESPACE |