diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-06-25 07:36:50 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-06-25 07:55:01 (GMT) |
| commit | 3b7ae67fe2715838c32ff28694761e57e4f79537 (patch) | |
| tree | 38844b42358ce78a19c9d5efa560e8a69574f9f5 | |
| parent | b38bf31ec617e36ac9556031db965c3d9eae23f7 (diff) | |
| download | Qt-3b7ae67fe2715838c32ff28694761e57e4f79537.zip Qt-3b7ae67fe2715838c32ff28694761e57e4f79537.tar.gz Qt-3b7ae67fe2715838c32ff28694761e57e4f79537.tar.bz2 | |
Fix compilation when configured with -no-xrender
Reviewed-by: Eskil
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 3664743..e4d9848 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -2155,7 +2155,7 @@ void qt_init(QApplicationPrivate *priv, int, X11->fc_scale = fc_scale; for (int s = 0; s < ScreenCount(X11->display); ++s) { int subpixel = FC_RGBA_UNKNOWN; -#if RENDER_MAJOR > 0 || RENDER_MINOR >= 6 +#if !defined(QT_NO_XRENDER) && (RENDER_MAJOR > 0 || RENDER_MINOR >= 6) if (X11->use_xrender) { int rsp = XRenderQuerySubpixelOrder(X11->display, s); switch (rsp) { |