aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qmlscene')
-rw-r--r--tools/qmlscene/.prev_CMakeLists.txt7
-rw-r--r--tools/qmlscene/CMakeLists.txt7
-rw-r--r--tools/qmlscene/main.cpp3
3 files changed, 8 insertions, 9 deletions
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index c56301e359..df4bfeaf44 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -9,14 +9,13 @@ qt_add_tool(qmlscene
main.cpp
DEFINES
QML_RUNTIME_TESTING
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Qml
Qt::Quick
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index 4212c627d4..b53816c494 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -10,14 +10,13 @@ qt_add_tool(qmlscene
main.cpp
DEFINES
QML_RUNTIME_TESTING
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Qml
Qt::Quick
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 28370cb522..b0635a7e87 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -500,7 +500,8 @@ int main(int argc, char ** argv)
}
}
- if (qEnvironmentVariableIsSet("QMLSCENE_CORE_PROFILE"))
+ if (qEnvironmentVariableIsSet("QMLSCENE_CORE_PROFILE")
+ || qEnvironmentVariableIsSet("QSG_CORE_PROFILE"))
options.coreProfile = true;
// Set default surface format before creating the window