summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2019-02-05 17:19:21 +0100
committerChristian Strømme <christian.stromme@qt.io>2019-02-08 09:56:41 +0000
commit35fc9cdfeec94cd40a80777a85e824146770b50d (patch)
tree9a5de6ab722b56e91e28e7bf1142f00ac5b4c9ee
parent50565141cceb780bba1805fc7aab307a34ba27d1 (diff)
Change env variable for the animation system to take an int value
This is more consistent with what we do elsewhere, and makes it easier to change between the two without needing to unset the env variable each time Change-Id: I85c5d67b0bab465ab3b16cda8ee07853e98161c4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/runtime/slideplayerng/q3dsslideplayerng.cpp2
-rw-r--r--tools/q3dsviewer/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/slideplayerng/q3dsslideplayerng.cpp b/src/runtime/slideplayerng/q3dsslideplayerng.cpp
index fa612d0..d9c7365 100644
--- a/src/runtime/slideplayerng/q3dsslideplayerng.cpp
+++ b/src/runtime/slideplayerng/q3dsslideplayerng.cpp
@@ -60,7 +60,7 @@ static void forAllSlideComponents(Q3DSSlide *slide, std::function<void (Q3DSComp
}
bool Q3DSSlideUtils::useDragonWings() {
- static bool b = qEnvironmentVariableIsSet("Q3DS_NO_DRAGONWINGS");
+ static bool b = (qEnvironmentVariableIntValue("Q3DS_NO_DRAGONWINGS") > 0);
static bool first = true;
if (b && first) {
first = false;
diff --git a/tools/q3dsviewer/main.cpp b/tools/q3dsviewer/main.cpp
index 15d2d7d..7f341f9 100644
--- a/tools/q3dsviewer/main.cpp
+++ b/tools/q3dsviewer/main.cpp
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
cmdLineParser.process(app);
if (cmdLineParser.isSet(noDragonWings))
- qputenv("Q3DS_NO_DRAGONWINGS", QByteArray());
+ qputenv("Q3DS_NO_DRAGONWINGS", QByteArrayLiteral("1"));
QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat());