aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2024-01-16 10:50:41 +0100
committerUlf Hermann <[email protected]>2024-01-17 15:36:27 +0100
commitff8c6222e4e0716683705412d82c6a368ccd6c80 (patch)
tree925e1727c904ca1465de7958824403a6a2229984
parent508f582611614cbcdd4a6ae6f5019977fecb4b20 (diff)
Fix some compile errors when compiling with -no-gui -no-qml-debug
Change-Id: I33254477ad4535c898d1091b1275cc4d9a3de5d4 Reviewed-by: Fabian Kosmale <[email protected]>
-rw-r--r--src/qml/jsruntime/qv4profiling_p.h4
-rw-r--r--src/qml/qml/qqmlbinding.cpp2
-rw-r--r--tools/qml/main.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index 6fdd457f9d..d1e8e34ba3 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -23,8 +23,8 @@
#if !QT_CONFIG(qml_debug)
-#define Q_V4_PROFILE_ALLOC(engine, size, type) (!engine)
-#define Q_V4_PROFILE_DEALLOC(engine, size, type) (!engine)
+#define Q_V4_PROFILE_ALLOC(engine, size, type) Q_UNUSED(engine)
+#define Q_V4_PROFILE_DEALLOC(engine, size, type) Q_UNUSED(engine)
QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index a7fe363058..f1bedaf65f 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -410,6 +410,8 @@ QQmlBinding *QQmlBinding::createTranslationBinding(
location.line, location.column });
}
+#else
+ Q_UNUSED(propertyName)
#endif
return b;
}
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 03925dfdb4..35df52d253 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -80,9 +80,11 @@ static bool verboseMode = false;
static bool quietMode = false;
static bool glShareContexts = true;
static bool disableShaderCache = true;
+#if defined(QT_GUI_LIB)
static bool requestAlphaChannel = false;
static bool requestMSAA = false;
static bool requestCoreProfile = false;
+#endif
static void loadConf(const QString &override, bool quiet) // Terminates app on failure
{