diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-10 15:02:09 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-10 13:07:14 +0000 |
commit | 6c6644c19f61d79ef9e11bac48e8efc9a0d624dc (patch) | |
tree | 01384ce1033440a6b86f75a0996bc6a2551513f5 | |
parent | d0b251c507534cfcc672f298fbd1af7fa13673eb (diff) | |
parent | 4d4b15f48b82345619901cead73a7ce78a2b08f8 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
* origin/5.14:
4d4b15f Doc: Bump version to 5.14.1
fa9ddd0 Remove emulator specific code blocks from demos
534cd52 Remove lfs config
be1e3a7 Move WebEngine initialization to be earlier
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: I2844c04a3b247117b653d1f23572b9d6add34931
-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"); |