diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
commit | 82913414623f36acb3d2c07d6c124af9f61fcdb4 (patch) | |
tree | 610f66dd1fcb487e20bbf18587e8cfad38a40826 /src/qml/qml | |
parent | d34098d8981d9103626ff7264e7b5ec084bfb63e (diff) | |
parent | f95fdacb3a12e4f0d37d3c32b34326f2bd1536de (diff) |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qml.pri | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlabstracturlinterceptor.cpp | 3 | ||||
-rw-r--r-- | src/qml/qml/qqmlabstracturlinterceptor.h (renamed from src/qml/qml/qqmlabstracturlinterceptor_p.h) | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlcompiler.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlfileselector.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlfileselector_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 2 |
10 files changed, 10 insertions, 13 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index f969f5c644..3bba6f8e83 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -126,7 +126,7 @@ HEADERS += \ $$PWD/qqmlplatform_p.h \ $$PWD/qqmlbinding_p.h \ $$PWD/qqmlextensionplugin_p.h \ - $$PWD/qqmlabstracturlinterceptor_p.h \ + $$PWD/qqmlabstracturlinterceptor.h \ $$PWD/qqmlapplicationengine_p.h \ $$PWD/qqmlapplicationengine.h \ $$PWD/qqmllistwrapper_p.h \ diff --git a/src/qml/qml/qqmlabstracturlinterceptor.cpp b/src/qml/qml/qqmlabstracturlinterceptor.cpp index 321698ad8e..127dad86ce 100644 --- a/src/qml/qml/qqmlabstracturlinterceptor.cpp +++ b/src/qml/qml/qqmlabstracturlinterceptor.cpp @@ -44,9 +44,6 @@ \inmodule QtQml \brief allows you to control QML file loading. - \note This class is not currently public API, due to the risk of being affected - by planned engine changes in upcoming releases. - QQmlAbstractUrlInterceptor is an interface which can be used to alter URLs before they are used by the QML engine. This is primarily useful for altering file urls into other file urls, such as selecting different graphical assets diff --git a/src/qml/qml/qqmlabstracturlinterceptor_p.h b/src/qml/qml/qqmlabstracturlinterceptor.h index 471c837eed..4bcaa89b4a 100644 --- a/src/qml/qml/qqmlabstracturlinterceptor_p.h +++ b/src/qml/qml/qqmlabstracturlinterceptor.h @@ -43,11 +43,11 @@ #define QQMLABSTRACTURLINTERCEPTOR_H #include <QtCore/qurl.h> -#include <private/qtqmlglobal_p.h> +#include <QtQml/qtqmlglobal.h> QT_BEGIN_NAMESPACE -class Q_QML_PRIVATE_EXPORT QQmlAbstractUrlInterceptor +class Q_QML_EXPORT QQmlAbstractUrlInterceptor { Q_FLAGS(InterceptionPoint) public: diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp index 1e5f6bfa34..2e208f2f3b 100644 --- a/src/qml/qml/qqmlcompiler.cpp +++ b/src/qml/qml/qqmlcompiler.cpp @@ -61,7 +61,7 @@ #include "qqmlscriptstring.h" #include "qqmlglobal_p.h" #include "qqmlbinding_p.h" -#include "qqmlabstracturlinterceptor_p.h" +#include "qqmlabstracturlinterceptor.h" #include <QDebug> #include <QPointF> diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index 7731935b75..78e6650d02 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -48,7 +48,7 @@ #include "qqmlengine_p.h" #include "qqmlengine.h" #include "qqmlinfo.h" -#include "qqmlabstracturlinterceptor_p.h" +#include "qqmlabstracturlinterceptor.h" #include <qjsengine.h> #include <QtCore/qvarlengtharray.h> diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 83ed627339..f8e5ad5874 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -66,7 +66,7 @@ #include <private/qv4debugservice_p.h> #include <private/qdebugmessageservice_p.h> #include "qqmlincubator.h" -#include "qqmlabstracturlinterceptor_p.h" +#include "qqmlabstracturlinterceptor.h" #include <private/qv8profilerservice_p.h> #include <private/qqmlboundsignal_p.h> diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp index 7f2007ec00..6ddc2eb2ff 100644 --- a/src/qml/qml/qqmlfileselector.cpp +++ b/src/qml/qml/qqmlfileselector.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <QtCore/QFileSelector> +#include <QtQml/QQmlAbstractUrlInterceptor> #include <qobjectdefs.h> #include "qqmlfileselector.h" #include "qqmlfileselector_p.h" -#include "qqmlabstracturlinterceptor_p.h" #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlfileselector_p.h b/src/qml/qml/qqmlfileselector_p.h index fe3679e08d..501f563ade 100644 --- a/src/qml/qml/qqmlfileselector_p.h +++ b/src/qml/qml/qqmlfileselector_p.h @@ -54,8 +54,8 @@ // #include "qqmlfileselector.h" -#include "qqmlabstracturlinterceptor_p.h" #include <QSet> +#include <QQmlAbstractUrlInterceptor> #include <private/qobject_p.h> #include <private/qtqmlglobal_p.h> diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index c9694da0df..6eda55e35b 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qqmltypeloader_p.h" -#include "qqmlabstracturlinterceptor_p.h" +#include "qqmlabstracturlinterceptor.h" #include "qqmlcontextwrapper_p.h" #include "qqmlexpression_p.h" diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index c9a5edc39e..b93cf2942d 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -59,6 +59,7 @@ #include <QtQml/qqmlerror.h> #include <QtQml/qqmlengine.h> #include <QtQml/qqmlfile.h> +#include <QtQml/qqmlabstracturlinterceptor.h> #include <private/qhashedstring_p.h> #include <private/qqmlscript_p.h> @@ -67,7 +68,6 @@ #include <private/qqmldirparser_p.h> #include <private/qqmlbundle_p.h> #include <private/qflagpointer_p.h> -#include <private/qqmlabstracturlinterceptor_p.h> #include <private/qv4value_p.h> #include <private/qv4script_p.h> |