43 lines
3.2 KiB
Diff
43 lines
3.2 KiB
Diff
diff -up qtdeclarative-opensource-src-5.6.0-beta1/tools/qml/main.cpp.highdpiscaling qtdeclarative-opensource-src-5.6.0-beta1/tools/qml/main.cpp
|
|
--- qtdeclarative-opensource-src-5.6.0-beta1/tools/qml/main.cpp.highdpiscaling 2015-10-30 04:55:09.000000000 -0500
|
|
+++ qtdeclarative-opensource-src-5.6.0-beta1/tools/qml/main.cpp 2015-12-05 19:04:51.225945491 -0600
|
|
@@ -332,7 +332,7 @@ void printUsage()
|
|
printf("\t-desktop.......................Force use of desktop GL (AA_UseDesktopOpenGL)\n");
|
|
printf("\t-gles..........................Force use of GLES (AA_UseOpenGLES)\n");
|
|
printf("\t-software......................Force use of software rendering (AA_UseOpenGLES)\n");
|
|
- printf("\t-no-scaling....................Disable High DPI scaling (AA_NoHighDpiScaling)\n");
|
|
+ printf("\t-no-scaling....................Disable High DPI scaling (AA_DisableHighDpiScaling)\n");
|
|
printf("\tDebugging options:\n");
|
|
printf("\t-verbose ..................... Print information about what qml is doing, like specific file urls being loaded.\n");
|
|
printf("\t-translation [file] .......... Load the given file as the translations file.\n");
|
|
@@ -505,7 +505,7 @@ int main(int argc, char *argv[])
|
|
} else if (arg == QLatin1String("-desktop")) {
|
|
QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
|
|
} else if (arg == QLatin1String("-no-scaling")) {
|
|
- QCoreApplication::setAttribute(Qt::AA_NoHighDpiScaling);
|
|
+ QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
|
|
} else {
|
|
files << arg;
|
|
}
|
|
diff -up qtdeclarative-opensource-src-5.6.0-beta1/tools/qmlscene/main.cpp.highdpiscaling qtdeclarative-opensource-src-5.6.0-beta1/tools/qmlscene/main.cpp
|
|
--- qtdeclarative-opensource-src-5.6.0-beta1/tools/qmlscene/main.cpp.highdpiscaling 2015-10-30 04:55:09.000000000 -0500
|
|
+++ qtdeclarative-opensource-src-5.6.0-beta1/tools/qmlscene/main.cpp 2015-12-05 19:05:28.617255664 -0600
|
|
@@ -356,7 +356,7 @@ 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)");
|
|
- puts(" --no-scaling.......................Disable High DPI scaling (AA_NoHighDpiScaling)");
|
|
+ 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");
|
|
@@ -452,7 +452,7 @@ int main(int argc, char ** argv)
|
|
else if (!qstrcmp(arg, "--desktop"))
|
|
options.applicationAttributes.append(Qt::AA_UseDesktopOpenGL);
|
|
else if (!qstrcmp(arg, "--no-scaling"))
|
|
- options.applicationAttributes.append(Qt::AA_NoHighDpiScaling);
|
|
+ options.applicationAttributes.append(Qt::AA_DisableHighDpiScaling);
|
|
}
|
|
|
|
foreach (Qt::ApplicationAttribute a, options.applicationAttributes)
|