aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/qml/qml-i18n/main.cpp1
-rw-r--r--examples/quick/models/objectlistmodel/main.cpp1
-rw-r--r--examples/quick/scenegraph/customgeometry/main.cpp1
-rw-r--r--examples/quick/tableview/gameoflife/main.cpp1
-rw-r--r--tests/manual/listview/main.cpp2
-rw-r--r--tests/manual/mousearea/main.cpp1
-rw-r--r--tests/manual/pointer/main.cpp1
-rw-r--r--tests/manual/tableview/abstracttablemodel/main.cpp1
-rw-r--r--tests/manual/tableview/listmodel/main.cpp1
-rw-r--r--tests/manual/tableview/storagemodel/main.cpp1
-rw-r--r--tests/manual/tableview/tablemodel/form/main.cpp1
-rw-r--r--tests/manual/tableview/tablemodel/json/main.cpp1
-rw-r--r--tools/qml/main.cpp10
-rw-r--r--tools/qmlscene/main.cpp6
14 files changed, 0 insertions, 29 deletions
diff --git a/examples/qml/qml-i18n/main.cpp b/examples/qml/qml-i18n/main.cpp
index 0680dc8b41..9f6c588b84 100644
--- a/examples/qml/qml-i18n/main.cpp
+++ b/examples/qml/qml-i18n/main.cpp
@@ -52,7 +52,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
const QUrl url(QStringLiteral("qrc:/qml-i18n.qml"));
diff --git a/examples/quick/models/objectlistmodel/main.cpp b/examples/quick/models/objectlistmodel/main.cpp
index 1418af90ca..8fbe7c183c 100644
--- a/examples/quick/models/objectlistmodel/main.cpp
+++ b/examples/quick/models/objectlistmodel/main.cpp
@@ -66,7 +66,6 @@
//![0]
int main(int argc, char ** argv)
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QList<QObject *> dataList = {
diff --git a/examples/quick/scenegraph/customgeometry/main.cpp b/examples/quick/scenegraph/customgeometry/main.cpp
index 0b9b2eb3f9..15310d279f 100644
--- a/examples/quick/scenegraph/customgeometry/main.cpp
+++ b/examples/quick/scenegraph/customgeometry/main.cpp
@@ -56,7 +56,6 @@
//! [1]
int main(int argc, char **argv)
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQuickView view;
diff --git a/examples/quick/tableview/gameoflife/main.cpp b/examples/quick/tableview/gameoflife/main.cpp
index 1500efdcca..8fa6b8b1db 100644
--- a/examples/quick/tableview/gameoflife/main.cpp
+++ b/examples/quick/tableview/gameoflife/main.cpp
@@ -54,7 +54,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/tests/manual/listview/main.cpp b/tests/manual/listview/main.cpp
index 8b28b91ee8..ea9cb22cd8 100644
--- a/tests/manual/listview/main.cpp
+++ b/tests/manual/listview/main.cpp
@@ -90,8 +90,6 @@ private:
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
QGuiApplication app(argc, argv);
qmlRegisterType<TestModel>("TestModel", 0, 1, "TestModel");
diff --git a/tests/manual/mousearea/main.cpp b/tests/manual/mousearea/main.cpp
index ea41cb521a..00c097e6c3 100644
--- a/tests/manual/mousearea/main.cpp
+++ b/tests/manual/mousearea/main.cpp
@@ -32,7 +32,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/tests/manual/pointer/main.cpp b/tests/manual/pointer/main.cpp
index 43ad182a76..87a38382c1 100644
--- a/tests/manual/pointer/main.cpp
+++ b/tests/manual/pointer/main.cpp
@@ -33,7 +33,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
qmlRegisterType<InputInspector>("org.qtproject.Test", 1, 0, "InputInspector");
diff --git a/tests/manual/tableview/abstracttablemodel/main.cpp b/tests/manual/tableview/abstracttablemodel/main.cpp
index 4fba938ee9..f29169d500 100644
--- a/tests/manual/tableview/abstracttablemodel/main.cpp
+++ b/tests/manual/tableview/abstracttablemodel/main.cpp
@@ -242,7 +242,6 @@ private:
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
qmlRegisterType<TestTableModel>("TestTableModel", 0, 1, "TestTableModel");
diff --git a/tests/manual/tableview/listmodel/main.cpp b/tests/manual/tableview/listmodel/main.cpp
index 2a3b90d392..f59c92a5a4 100644
--- a/tests/manual/tableview/listmodel/main.cpp
+++ b/tests/manual/tableview/listmodel/main.cpp
@@ -42,7 +42,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/tests/manual/tableview/storagemodel/main.cpp b/tests/manual/tableview/storagemodel/main.cpp
index 97ae619ce4..1ba6d303cc 100644
--- a/tests/manual/tableview/storagemodel/main.cpp
+++ b/tests/manual/tableview/storagemodel/main.cpp
@@ -43,7 +43,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
qmlRegisterType<StorageModel>("StorageModel", 0, 1, "StorageModel");
diff --git a/tests/manual/tableview/tablemodel/form/main.cpp b/tests/manual/tableview/tablemodel/form/main.cpp
index 2a3b90d392..f59c92a5a4 100644
--- a/tests/manual/tableview/tablemodel/form/main.cpp
+++ b/tests/manual/tableview/tablemodel/form/main.cpp
@@ -42,7 +42,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/tests/manual/tableview/tablemodel/json/main.cpp b/tests/manual/tableview/tablemodel/json/main.cpp
index 176b532d49..22a6ccf647 100644
--- a/tests/manual/tableview/tablemodel/json/main.cpp
+++ b/tests/manual/tableview/tablemodel/json/main.cpp
@@ -42,7 +42,6 @@
int main(int argc, char *argv[])
{
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 64ed09cf48..4aa270ae9e 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -331,10 +331,6 @@ static void getAppFlags(int argc, char **argv)
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
} else if (!strcmp(argv[i], "-software") || !strcmp(argv[i], "--software")) {
QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
- } else if (!strcmp(argv[i], "-scaling") || !strcmp(argv[i], "--scaling")) {
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- } else if (!strcmp(argv[i], "-no-scaling") || !strcmp(argv[i], "--no-scaling")) {
- QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
}
}
#else
@@ -459,12 +455,6 @@ int main(int argc, char *argv[])
QCommandLineOption glSoftwareOption(QStringLiteral("software"),
QCoreApplication::translate("main", "Force use of software rendering (AA_UseSoftwareOpenGL)."));
parser.addOption(glSoftwareOption); // Just for the help text... we've already handled this argument above
- QCommandLineOption scalingOption(QStringLiteral("scaling"),
- QCoreApplication::translate("main", "Enable High DPI scaling (AA_EnableHighDpiScaling)."));
- parser.addOption(scalingOption); // Just for the help text... we've already handled this argument above
- QCommandLineOption noScalingOption(QStringLiteral("no-scaling"),
- QCoreApplication::translate("main", "Disable High DPI scaling (AA_DisableHighDpiScaling)."));
- parser.addOption(noScalingOption); // Just for the help text... we've already handled this argument above
#endif // QT_GUI_LIB
// Debugging and verbosity options
QCommandLineOption quietOption(QStringLiteral("quiet"),
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 449e682b4e..c0807ed751 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -360,8 +360,6 @@ 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(" --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");
#ifdef QT_WIDGETS_LIB
puts(" --apptype [gui|widgets] .......... Select which application class to use. Default is widgets.");
@@ -444,10 +442,6 @@ int main(int argc, char ** argv)
options.applicationAttributes.append(Qt::AA_UseSoftwareOpenGL);
} else if (!qstrcmp(arg, "--desktop")) {
options.applicationAttributes.append(Qt::AA_UseDesktopOpenGL);
- } else if (!qstrcmp(arg, "--scaling")) {
- options.applicationAttributes.append(Qt::AA_EnableHighDpiScaling);
- } else if (!qstrcmp(arg, "--no-scaling")) {
- options.applicationAttributes.append(Qt::AA_DisableHighDpiScaling);
} else if (!qstrcmp(arg, "--transparent")) {
options.transparent = true;
} else if (!qstrcmp(arg, "--multisample")) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 14:38:31 +0000