summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-17 10:34:17 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-17 10:34:17 +0200
commit1a62cad4a6b9a962874554e735b5db53169a8e56 (patch)
tree11db8c17204cc7f74c7029da0f08636ecaf6f36b /tools
parent9c4174f9f3fa4a0c46b11b3160d1b45d19bf66af (diff)
parent5ead393eba0fc9d7c05790887c53c3728b023195 (diff)
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlscene/main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index a1a162cda7..5c282d1d1d 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -499,6 +499,9 @@ int main(int argc, char ** argv)
QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR));
+ if (qEnvironmentVariableIsSet("QMLSCENE_CORE_PROFILE"))
+ options.coreProfile = true;
+
const QStringList arguments = QCoreApplication::arguments();
for (int i = 1, size = arguments.size(); i < size; ++i) {
if (!arguments.at(i).startsWith(QLatin1Char('-'))) {
@@ -525,8 +528,7 @@ int main(int argc, char ** argv)
options.resizeViewToRootItem = true;
else if (lowerArgument == QLatin1String("--multisample"))
options.multisample = true;
- else if (lowerArgument == QLatin1String("--core-profile")
- || qEnvironmentVariableIsSet("QMLSCENE_CORE_PROFILE"))
+ else if (lowerArgument == QLatin1String("--core-profile"))
options.coreProfile = true;
else if (lowerArgument == QLatin1String("--verbose"))
options.verbose = true;