diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /src/plugins/platforms/xcb/qxcbscreen.h | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbscreen.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index 0382be8a29..c36492db64 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE class QXcbConnection; class QXcbCursor; +class QXcbXSettings; class QXcbScreen : public QXcbObject, public QPlatformScreen { @@ -102,6 +103,9 @@ public: void readXResources(); QFontEngine::HintStyle hintStyle() const { return m_hintStyle; } + + QXcbXSettings *xSettings() const; + private: static bool xResource(const QByteArray &identifier, const QByteArray &expectedIdentifier, @@ -127,6 +131,7 @@ private: int m_refreshRate; int m_forcedDpi; QFontEngine::HintStyle m_hintStyle; + QXcbXSettings *m_xSettings; }; QT_END_NAMESPACE |