AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8.0' into 5.8

Browse Source 
Conflicts:
	src/plugins/platforms/android/qandroidinputcontext.cpp

Change-Id: I80f35a3d722f1e218ff338b6652e551da45c38e7
This commit is contained in:
Liang Qi 2017-01-25 22:39:42 +01:00
commit a23d705e18
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
View File

@ -1191,7 +1191,7 @@ void QWindowsFontDatabase::populateFontDatabase()
ReleaseDC(0, dummy); ReleaseDC(0, dummy);
// Work around EnumFontFamiliesEx() not listing the system font. // Work around EnumFontFamiliesEx() not listing the system font.
QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family(); QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family();
if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily).isEmpty()) if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
QPlatformFontDatabase::registerFontFamily(systemDefaultFamily); QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
} }

2
src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
View File

@ -386,7 +386,7 @@ void QWindowsFontDatabaseFT::populateFontDatabase()
ReleaseDC(0, dummy); ReleaseDC(0, dummy);
// Work around EnumFontFamiliesEx() not listing the system font // Work around EnumFontFamiliesEx() not listing the system font
QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family(); QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family();
if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily).isEmpty()) if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
QPlatformFontDatabase::registerFontFamily(systemDefaultFamily); QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
} }

5
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -512,11 +512,6 @@ QVariant QWindowsIntegration::styleHint(QPlatformIntegration::StyleHint hint) co
return QVariant(keyBoardAutoRepeatRateMS()); return QVariant(keyBoardAutoRepeatRateMS());
#endif #endif
case QPlatformIntegration::ShowIsMaximized: case QPlatformIntegration::ShowIsMaximized:
#ifndef QT_NO_CLIPBOARD
return qt_windowsIsTabletMode(d->m_clipboard.clipboardViewer());
#else
break;
#endif
case QPlatformIntegration::StartDragTime: case QPlatformIntegration::StartDragTime:
case QPlatformIntegration::StartDragDistance: case QPlatformIntegration::StartDragDistance:
case QPlatformIntegration::KeyboardInputInterval: case QPlatformIntegration::KeyboardInputInterval: