aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-15 16:25:29 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-15 17:45:04 +0200
commit0e0f7c0b7b7de5cc05ceb41201b807f557dde8fb (patch)
treec2a1a6eca1e556215dc8c78b9900ca1f81a42afd
parent7199b7f73087a0e2501baacb7de76164684f5dfe (diff)
Fix compile warning from deprecated application attributes
AA_DisableHighDpiScaling and AA_UseHighDpiPixmaps have been deprecated. As of 90358f6042d1fe2db849e17e1b0c875fb0560b20 and 2dc46c09026362cc267b1183faf09fb29479ef93 in qtbase, respectively, these settings are deprecated and have no effect. Change-Id: I1eb1f77a64893dd077bd08216d26633d43e1e0e3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/main.cpp1
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp1
-rw-r--r--examples/quickcontrols2/gallery/gallery.cpp1
-rw-r--r--examples/quickcontrols2/sidepanel/sidepanel.cpp1
-rw-r--r--examples/quickcontrols2/swipetoremove/swipetoremove.cpp1
-rw-r--r--tests/auto/shared/qtest_quickcontrols.h1
9 files changed, 0 insertions, 12 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp
index 246d5665..ea20c890 100644
--- a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp
@@ -53,8 +53,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp b/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp
index 246d5665..ea20c890 100644
--- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp
@@ -53,8 +53,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp
index 246d5665..ea20c890 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp
@@ -53,8 +53,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp b/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp
index 7b694b0a..2986e4b1 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp
@@ -82,7 +82,6 @@ static void connectToDatabase()
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
qmlRegisterType<SqlContactModel>("io.qt.examples.chattutorial", 1, 0, "SqlContactModel");
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp b/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp
index 7b694b0a..2986e4b1 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp
@@ -82,7 +82,6 @@ static void connectToDatabase()
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
qmlRegisterType<SqlContactModel>("io.qt.examples.chattutorial", 1, 0, "SqlContactModel");
diff --git a/examples/quickcontrols2/gallery/gallery.cpp b/examples/quickcontrols2/gallery/gallery.cpp
index bbcd2d14..629e69f9 100644
--- a/examples/quickcontrols2/gallery/gallery.cpp
+++ b/examples/quickcontrols2/gallery/gallery.cpp
@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
{
QGuiApplication::setApplicationName("Gallery");
QGuiApplication::setOrganizationName("QtProject");
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.cpp b/examples/quickcontrols2/sidepanel/sidepanel.cpp
index a2617291..4b328d1d 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.cpp
+++ b/examples/quickcontrols2/sidepanel/sidepanel.cpp
@@ -53,7 +53,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.cpp b/examples/quickcontrols2/swipetoremove/swipetoremove.cpp
index 9f54bc15..7f89344f 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.cpp
+++ b/examples/quickcontrols2/swipetoremove/swipetoremove.cpp
@@ -54,7 +54,6 @@
int main(int argc, char *argv[])
{
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication app(argc, argv);
QFontDatabase::addApplicationFont(":/fonts/fontello.ttf");
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h
index 17e5a6d2..acd0304c 100644
--- a/tests/auto/shared/qtest_quickcontrols.h
+++ b/tests/auto/shared/qtest_quickcontrols.h
@@ -77,7 +77,6 @@ static int runTests(QObject *testObject, int argc, char *argv[])
int main(int argc, char *argv[]) \
{ \
qputenv("QML_NO_TOUCH_COMPRESSION", "1"); \
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); \
QGuiApplication app(argc, argv); \
TestCase tc; \
QTEST_SET_MAIN_SOURCE_PATH \