diff options
| -rw-r--r-- | .lfsconfig | 2 | ||||
| -rw-r--r-- | basicsuite/qtquickcontrols2/gallery.cpp | 5 | ||||
| -rw-r--r-- | basicsuite/shared/main.cpp | 19 |
3 files changed, 9 insertions, 17 deletions
diff --git a/.lfsconfig b/.lfsconfig deleted file mode 100644 index ce7dadc..0000000 --- a/.lfsconfig +++ /dev/null @@ -1,2 +0,0 @@ -[lfs] -url = https://git-lfs.qt.io/Gerrit/boot2qt-demos.git/info/lfs diff --git a/basicsuite/qtquickcontrols2/gallery.cpp b/basicsuite/qtquickcontrols2/gallery.cpp index f6c6f66..bbe4c71 100644 --- a/basicsuite/qtquickcontrols2/gallery.cpp +++ b/basicsuite/qtquickcontrols2/gallery.cpp @@ -60,10 +60,7 @@ int main(int argc, char *argv[]) QGuiApplication::setApplicationName("Gallery"); QGuiApplication::setOrganizationName("QtProject"); - // Do not set HighDpiScaling for emulator, see QTBUG-64815 - if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index c6aefc3..9e27596 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -83,25 +83,22 @@ static bool checkGlAvailability() int main(int argc, char **argv) { +#if defined(USE_QTWEBENGINE) + // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. + // It enables sharing the QOpenGLContext of all QQuickWindows of the application. + // We have to do so until we expose public API for it in Qt or choose to enable it by default. + QtWebEngine::initialize(); +#endif + //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/qt/qtquickcontrols2/qtquickcontrols2.conf"); QIcon::setThemeName("gallery"); QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons"); - // Do not set HighDpiScaling for emulator, see QTBUG-64815 - if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); -#if defined(USE_QTWEBENGINE) - // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. - // It enables sharing the QOpenGLContext of all QQuickWindows of the application. - // We have to do so until we expose public API for it in Qt or choose to enable it by default. - QtWebEngine::initialize(); -#endif - QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Regular.ttf"); QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-SemiBold.ttf"); QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Bold.ttf"); |