diff options
| -rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 4 | ||||
| -rw-r--r-- | src/qml/jit/qv4jit.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 2e87f10302..58db26f2ac 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -521,11 +521,11 @@ private: QQmlProfiler *profiler; }; -#endif // QT_NO_QML_DEBUGGER +#endif // QT_CONFIG(qml_debug) QT_END_NAMESPACE -#ifndef QT_NO_QML_DEBUGGER +#if QT_CONFIG(qml_debug) Q_DECLARE_METATYPE(QVector<QQmlProfilerData>) Q_DECLARE_METATYPE(QQmlProfiler::LocationHash) diff --git a/src/qml/jit/qv4jit.cpp b/src/qml/jit/qv4jit.cpp index 1ab45d6765..1ef6cc4add 100644 --- a/src/qml/jit/qv4jit.cpp +++ b/src/qml/jit/qv4jit.cpp @@ -1288,10 +1288,8 @@ void BaselineJIT::collectLabelsInBytecode() MOTH_BEGIN_INSTR(Ret) MOTH_END_INSTR(Ret) -#ifndef QT_NO_QML_DEBUGGER MOTH_BEGIN_INSTR(Debug) MOTH_END_INSTR(Debug) -#endif // QT_NO_QML_DEBUGGER MOTH_BEGIN_INSTR(LoadQmlContext) MOTH_END_INSTR(LoadQmlContext) diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index 529cdaf070..4ca5fba7de 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -52,6 +52,7 @@ #include <QtGui/QWindow> #include <QtGui/qpa/qplatformnativeinterface.h> +#include <private/qqmlglobal_p.h> #include <private/qsgtexture_p.h> #include <private/qsgcompressedtexture_p.h> #include <private/qsgcompressedatlastexture_p.h> |