diff options
| -rw-r--r-- | src/webenginequick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineaction_p.h | 2 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.cpp | 2 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebenginescriptcollection.cpp | 2 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebenginescriptcollection_p.h (renamed from src/webenginequick/api/qquickwebenginescriptcollection.h) | 4 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index 5e56cf53f..7fd84c0a4 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -23,7 +23,7 @@ qt_internal_add_qml_module(WebEngineQuick api/qquickwebenginefaviconprovider_p_p.h api/qquickwebenginenewviewrequest.cpp api/qquickwebenginenewviewrequest_p.h api/qquickwebengineprofile.cpp api/qquickwebengineprofile.h api/qquickwebengineprofile_p.h - api/qquickwebenginescriptcollection.cpp api/qquickwebenginescriptcollection.h + api/qquickwebenginescriptcollection.cpp api/qquickwebenginescriptcollection_p.h api/qquickwebenginesettings.cpp api/qquickwebenginesettings_p.h api/qquickwebenginesingleton.cpp api/qquickwebenginesingleton_p.h api/qquickwebenginetouchhandleprovider.cpp diff --git a/src/webenginequick/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h index 5cb9e64d5..225803d86 100644 --- a/src/webenginequick/api/qquickwebengineaction_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p.h @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QQuickWebEngineActionPrivate; -class Q_WEBENGINEQUICK_EXPORT QQuickWebEngineAction : public QObject +class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineAction : public QObject { Q_OBJECT Q_PROPERTY(QString text READ text CONSTANT FINAL) diff --git a/src/webenginequick/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp index 3917730df..6944de95f 100644 --- a/src/webenginequick/api/qquickwebengineprofile.cpp +++ b/src/webenginequick/api/qquickwebengineprofile.cpp @@ -41,7 +41,7 @@ #include "qquickwebengineprofile_p.h" #include "qquickwebenginedownloadrequest_p.h" #include "qquickwebenginesettings_p.h" -#include "qquickwebenginescriptcollection.h" +#include "qquickwebenginescriptcollection_p.h" #include "qquickwebengineview_p_p.h" #include "profile_adapter.h" diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.cpp b/src/webenginequick/api/qquickwebenginescriptcollection.cpp index 6de9287c9..cc1cfb2fa 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.cpp +++ b/src/webenginequick/api/qquickwebenginescriptcollection.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qquickwebenginescriptcollection.h" +#include "qquickwebenginescriptcollection_p.h" #include "qwebenginescriptcollection.h" #include <QtWebEngineCore/private/qwebenginescriptcollection_p.h> #include <QtQml/qqmlinfo.h> diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection_p.h index f7210302a..8ba6d1536 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.h +++ b/src/webenginequick/api/qquickwebenginescriptcollection_p.h @@ -45,12 +45,12 @@ #include <QtCore/qscopedpointer.h> #include <QtQml/qjsvalue.h> #include <QtWebEngineCore/qwebenginescript.h> -#include <QtWebEngineQuick/qtwebenginequickglobal.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> QT_BEGIN_NAMESPACE class QWebEngineScriptCollection; -class Q_WEBENGINEQUICK_EXPORT QQuickWebEngineScriptCollection : public QObject +class Q_WEBENGINEQUICK_PRIVATE_EXPORT QQuickWebEngineScriptCollection : public QObject { Q_OBJECT public: diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 97592806d..22dea9121 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -45,7 +45,7 @@ #include "qquickwebenginenewviewrequest_p.h" #include "qquickwebengineprofile.h" #include "qquickwebengineprofile_p.h" -#include "qquickwebenginescriptcollection.h" +#include "qquickwebenginescriptcollection_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginetouchhandleprovider_p_p.h" #include "qquickwebengineview_p.h" diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index ac3397417..8b755cf57 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -38,10 +38,10 @@ #include <QtQml/QQmlEngine> #include <QtTest/QtTest> #include <QtWebEngineQuick/QQuickWebEngineProfile> -#include <QtWebEngineQuick/QQuickWebEngineScriptCollection> #include <QtGui/private/qinputmethod_p.h> -#include <QtWebEngineQuick/private/qquickwebengineview_p.h> +#include <QtWebEngineQuick/private/qquickwebenginescriptcollection_p.h> #include <QtWebEngineQuick/private/qquickwebenginesettings_p.h> +#include <QtWebEngineQuick/private/qquickwebengineview_p.h> #include <QtWebEngineCore/private/qtwebenginecore-config_p.h> #include <qpa/qplatforminputcontext.h> #include <QtTest/private/qemulationdetector_p.h> |