diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-29 15:53:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-11-02 17:06:32 +0000 |
| commit | 051684f125bbc31bd882c4cd313c3482bcd145a0 (patch) | |
| tree | 5a517941603d925cf5dc13fad8fedb83faf224fb /tools/qmlscene/main.cpp | |
| parent | 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4 (diff) | |
qmlscene/qml tools: Temporarily disable High DPI options.
To be re-enabled once the attribute names are final.
Task-number: QTBUG-46615
Change-Id: Id463167ab102e3c2f3af4fe39675853eae3bb851
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'tools/qmlscene/main.cpp')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 9bf1c200e4..53bd0bfbad 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -356,7 +356,9 @@ 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(" --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"); @@ -451,8 +453,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, "--no-scaling")) options.applicationAttributes.append(Qt::AA_NoHighDpiScaling); +#endif } foreach (Qt::ApplicationAttribute a, options.applicationAttributes) |