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

xcb: Remove unused NoFontHinting hint

Browse Source 
It is unused since 0f7bc885aa
(Turn off font hinting when active highdpi scaling).

Change-Id: I901407bedf24ae301acbe6afa94bc0a4cadb0620
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Alexander Volkov 2016-08-24 18:13:42 +03:00
parent 8cedf59a68
commit fc098de70a
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
View File

@ -85,7 +85,6 @@ static int resourceType(const QByteArray &key)
QByteArrayLiteral("gettimestamp"), QByteArrayLiteral("x11screen"), QByteArrayLiteral("gettimestamp"), QByteArrayLiteral("x11screen"),
QByteArrayLiteral("rootwindow"), QByteArrayLiteral("rootwindow"),
QByteArrayLiteral("subpixeltype"), QByteArrayLiteral("antialiasingenabled"), QByteArrayLiteral("subpixeltype"), QByteArrayLiteral("antialiasingenabled"),
QByteArrayLiteral("nofonthinting"),
QByteArrayLiteral("atspibus"), QByteArrayLiteral("atspibus"),
QByteArrayLiteral("compositingenabled") QByteArrayLiteral("compositingenabled")
}; };
@ -242,9 +241,6 @@ void *QXcbNativeInterface::nativeResourceForScreen(const QByteArray &resourceStr
case GetTimestamp: case GetTimestamp:
result = getTimestamp(xcbScreen); result = getTimestamp(xcbScreen);
break; break;
case NoFontHinting:
result = xcbScreen->noFontHinting() ? this : 0; //qboolptr...
break;
case RootWindow: case RootWindow:
result = reinterpret_cast<void *>(xcbScreen->root()); result = reinterpret_cast<void *>(xcbScreen->root());
break; break;

1
src/plugins/platforms/xcb/qxcbnativeinterface.h
View File

@ -73,7 +73,6 @@ public:
RootWindow, RootWindow,
ScreenSubpixelType, ScreenSubpixelType,
ScreenAntialiasingEnabled, ScreenAntialiasingEnabled,
NoFontHinting,
AtspiBus, AtspiBus,
CompositingEnabled CompositingEnabled
}; };

1
src/plugins/platforms/xcb/qxcbscreen.cpp
View File

@ -188,7 +188,6 @@ QXcbScreen::QXcbScreen(QXcbConnection *connection, QXcbVirtualDesktop *virtualDe
, m_forcedDpi(-1) , m_forcedDpi(-1)
, m_pixelDensity(1) , m_pixelDensity(1)
, m_hintStyle(QFontEngine::HintStyle(-1)) , m_hintStyle(QFontEngine::HintStyle(-1))
, m_noFontHinting(false)
, m_subpixelType(QFontEngine::SubpixelAntialiasingType(-1)) , m_subpixelType(QFontEngine::SubpixelAntialiasingType(-1))
, m_antialiasingEnabled(-1) , m_antialiasingEnabled(-1)
{ {

2
src/plugins/platforms/xcb/qxcbscreen.h
View File

@ -172,7 +172,6 @@ public:
void readXResources(); void readXResources();
QFontEngine::HintStyle hintStyle() const { return m_hintStyle; } QFontEngine::HintStyle hintStyle() const { return m_hintStyle; }
bool noFontHinting() const { return m_noFontHinting; }
QFontEngine::SubpixelAntialiasingType subpixelType() const { return m_subpixelType; } QFontEngine::SubpixelAntialiasingType subpixelType() const { return m_subpixelType; }
int antialiasingEnabled() const { return m_antialiasingEnabled; } int antialiasingEnabled() const { return m_antialiasingEnabled; }
@ -208,7 +207,6 @@ private:
int m_forcedDpi; int m_forcedDpi;
int m_pixelDensity; int m_pixelDensity;
QFontEngine::HintStyle m_hintStyle; QFontEngine::HintStyle m_hintStyle;
bool m_noFontHinting;
QFontEngine::SubpixelAntialiasingType m_subpixelType; QFontEngine::SubpixelAntialiasingType m_subpixelType;
int m_antialiasingEnabled; int m_antialiasingEnabled;
}; };