Revert "qmlscene/qml tools: Temporarily disable High DPI options."

Re-enable the options after the attributes have their final names.
Add options for enabling scaling.

This reverts commit 051684f125bbc31bd882c4cd313c3482bcd145a0.

Task-number: QTBUG-46615
Task-number: QTBUG-48379
Change-Id: If862061c688f9febff3b9511a4f19649b07d2011
Reviewed-by: J-P Nurmi <[email protected]>

1 files changed, 5 insertions, 6 deletions

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 53bd0bfbad..fc4fc3e167 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -356,9 +356,8 @@ static void usage()
     puts("  --desktop..........................Force use of desktop GL (AA_UseDesktopOpenGL)");
     puts("  --gles.............................Force use of GLES (AA_UseOpenGLES)");
     puts("  --software.........................Force use of software rendering (AA_UseOpenGLES)");
-#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615)
-    puts("  --no-scaling.......................Disable High DPI scaling (AA_NoHighDpiScaling)");
-#endif
+    puts("  --scaling..........................Enable High DPI scaling (AA_EnableHighDpiScaling)");
+    puts("  --no-scaling.......................Disable High DPI scaling (AA_DisableHighDpiScaling)");
     puts("  --verbose..........................Print version and graphical diagnostics for the run-time");
     puts("  -I <path> ........................ Add <path> to the list of import paths");
     puts("  -P <path> ........................ Add <path> to the list of plugin paths");
@@ -453,10 +452,10 @@ int main(int argc, char ** argv)
             options.applicationAttributes.append(Qt::AA_UseSoftwareOpenGL);
         else if (!qstrcmp(arg, "--desktop"))
             options.applicationAttributes.append(Qt::AA_UseDesktopOpenGL);
-#if 0 // FIXME: 5.6: Re-enable once attribute naming is final (QTBUG-46615)
+        else if (!qstrcmp(arg, "--scaling"))
+            options.applicationAttributes.append(Qt::AA_EnableHighDpiScaling);
         else if (!qstrcmp(arg, "--no-scaling"))
-            options.applicationAttributes.append(Qt::AA_NoHighDpiScaling);
-#endif
+            options.applicationAttributes.append(Qt::AA_DisableHighDpiScaling);
     }
 
     foreach (Qt::ApplicationAttribute a, options.applicationAttributes)