diff options
Diffstat (limited to 'src/webenginequick/api')
15 files changed, 28 insertions, 28 deletions
diff --git a/src/webenginequick/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h index 8f5f3386c..c429d8917 100644 --- a/src/webenginequick/api/qquickwebengineaction_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p.h @@ -53,7 +53,7 @@ #include <QObject> #include <QtQml/qqml.h> -#include "qtwebengineglobal_p.h" +#include "qtwebenginequickglobal_p.h" #include <QVariant> namespace QtWebEngineCore { diff --git a/src/webenginequick/api/qquickwebengineaction_p_p.h b/src/webenginequick/api/qquickwebengineaction_p_p.h index d2ead30e9..e5093f89f 100644 --- a/src/webenginequick/api/qquickwebengineaction_p_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p_p.h @@ -52,7 +52,7 @@ // #include <QObject> -#include "qtwebengineglobal_p.h" +#include "qtwebenginequickglobal_p.h" #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h index a62150404..1e05f4fcd 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QtCore/QDateTime> #include <QtCore/QObject> diff --git a/src/webenginequick/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h index f3b5997d0..f4c206875 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests_p.h +++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QtCore/QUrl> #include <QtCore/QWeakPointer> #include <QtCore/QRect> diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h index d284a73d5..922f8b3ac 100644 --- a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QtCore/QList> #include <QtQuick/QQuickImageProvider> diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index 93a7fbfdc..8d71d3303 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -40,7 +40,7 @@ #ifndef QQUICKWEBENGINEPROFILE_H #define QQUICKWEBENGINEPROFILE_H -#include <QtWebEngineQuick/qtwebengineglobal.h> +#include <QtWebEngineQuick/qtwebenginequickglobal.h> #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtCore/QString> diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h index e125fee96..b296ecbf4 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.h +++ b/src/webenginequick/api/qquickwebenginescriptcollection.h @@ -40,7 +40,7 @@ #ifndef QQUICKWEBENGINESCRIPTCOLLECTION_H #define QQUICKWEBENGINESCRIPTCOLLECTION_H -#include <QtWebEngineQuick/qtwebengineglobal.h> +#include <QtWebEngineQuick/qtwebenginequickglobal.h> #include <QtWebEngineCore/qwebenginescript.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qlist.h> diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h index f400172e1..f3c55693b 100644 --- a/src/webenginequick/api/qquickwebenginesettings_p.h +++ b/src/webenginequick/api/qquickwebenginesettings_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QObject> #include <QScopedPointer> diff --git a/src/webenginequick/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h index 224bfa495..9dc7090d8 100644 --- a/src/webenginequick/api/qquickwebenginesingleton_p.h +++ b/src/webenginequick/api/qquickwebenginesingleton_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QtWebEngineCore/qwebenginescript.h> #include <QtCore/qobject.h> diff --git a/src/webenginequick/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h index 8f8bfde4d..853c7cbde 100644 --- a/src/webenginequick/api/qquickwebenginetestsupport_p.h +++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h @@ -52,7 +52,7 @@ // #include <QtGui/private/qinputmethod_p.h> -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QEvent> #include <QObject> diff --git a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h index 8f5f8cc94..fac136fe6 100644 --- a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h @@ -52,7 +52,7 @@ // #include <QtQuick/QQuickImageProvider> -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h index 0ec0e91e1..b3c092856 100644 --- a/src/webenginequick/api/qquickwebengineview_p.h +++ b/src/webenginequick/api/qquickwebengineview_p.h @@ -52,7 +52,7 @@ // #include <QtWebEngineCore/qtwebenginecoreglobal.h> -#include <QtWebEngineQuick/private/qtwebengineglobal_p.h> +#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h> #include <QQuickItem> #include <QtGui/qcolor.h> diff --git a/src/webenginequick/api/qtwebengineglobal.cpp b/src/webenginequick/api/qtwebenginequickglobal.cpp index 7d2b91e90..68e4a7c3b 100644 --- a/src/webenginequick/api/qtwebengineglobal.cpp +++ b/src/webenginequick/api/qtwebenginequickglobal.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qtwebengineglobal.h" +#include <QtWebEngineQuick/qtwebenginequickglobal.h> #include <QCoreApplication> #include <QQuickWindow> @@ -48,21 +48,21 @@ namespace QtWebEngineCore QT_BEGIN_NAMESPACE -namespace QtWebEngine { +namespace QtWebEngineQuick { /*! - \namespace QtWebEngine - \inmodule QtWebEngine + \namespace QtWebEngineQuick + \inmodule QtWebEngineQuick \ingroup qtwebengine-namespaces \keyword QtWebEngine Namespace \brief Helper functions for the \QWE (Qt Quick) module. - The \l[CPP]{QtWebEngine} namespace is part of the \QWE module. + The \l[CPP]{QtWebEngineQuick} namespace is part of the \QWE module. */ /*! - \fn QtWebEngine::initialize() + \fn QtWebEngineQuick::initialize() Sets up an OpenGL Context that can be shared between threads. This has to be done before QGuiApplication is created and before window's QPlatformOpenGLContext is created. @@ -74,7 +74,7 @@ namespace QtWebEngine { void initialize() { if (!QCoreApplication::startingUp()) { - qWarning("QtWebEngine::initialize() called with QCoreApplication object already created and should be call before. "\ + qWarning("QtWebEngineQuick::initialize() called with QCoreApplication object already created and should be call before. "\ "This is depreciated and may fail in the future."); QtWebEngineCore::initialize(); return; @@ -83,6 +83,6 @@ void initialize() qAddPreRoutine(QtWebEngineCore::initialize); QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); } -} // namespace QtWebEngine +} // namespace QtWebEngineQuick QT_END_NAMESPACE diff --git a/src/webenginequick/api/qtwebengineglobal.h b/src/webenginequick/api/qtwebenginequickglobal.h index 50a91b745..c94bd66d3 100644 --- a/src/webenginequick/api/qtwebengineglobal.h +++ b/src/webenginequick/api/qtwebenginequickglobal.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QTWEBENGINEGLOBAL_H -#define QTWEBENGINEGLOBAL_H +#ifndef QTWEBENGINEQUICKGLOBAL_H +#define QTWEBENGINEQUICKGLOBAL_H #include <QtCore/qglobal.h> #include <QtWebEngineQuick/qtwebenginequick-config.h> @@ -55,11 +55,11 @@ QT_BEGIN_NAMESPACE # define Q_WEBENGINE_EXPORT #endif -namespace QtWebEngine +namespace QtWebEngineQuick { Q_WEBENGINE_EXPORT void initialize(); } QT_END_NAMESPACE -#endif // QTWEBENGINEGLOBAL_H +#endif // QTWEBENGINEQUICKGLOBAL_H diff --git a/src/webenginequick/api/qtwebengineglobal_p.h b/src/webenginequick/api/qtwebenginequickglobal_p.h index 549de30d2..5d8909c18 100644 --- a/src/webenginequick/api/qtwebengineglobal_p.h +++ b/src/webenginequick/api/qtwebenginequickglobal_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QTWEBENGINEGLOBAL_P_H -#define QTWEBENGINEGLOBAL_P_H +#ifndef QTWEBENGINEQUICKGLOBAL_P_H +#define QTWEBENGINEQUICKGLOBAL_P_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWebEngineQuick/qtwebengineglobal.h> +#include <QtWebEngineQuick/qtwebenginequickglobal.h> #include <QtCore/private/qglobal_p.h> #include <QtWebEngineQuick/private/qtwebenginequick-config_p.h> @@ -61,4 +61,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -#endif // QTWEBENGINEGLOBAL_P_H +#endif // QTWEBENGINEQUICKGLOBAL_P_H |