31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
From bb8255da422470c5012b6b1c4c24eb2afb6804dc Mon Sep 17 00:00:00 2001
|
|
From: Thiago Macieira <thiago.macieira@nokia.com>
|
|
Date: Fri, 26 Jun 2009 11:41:45 +0200
|
|
Subject: [PATCH 09/13] Restore a section of the file that got removed due to conflict resolution.
|
|
|
|
Thanks to Kevin Kofler for pointing this out
|
|
---
|
|
src/gui/kernel/qapplication_x11.cpp | 6 +++---
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
|
|
index 33aec9e..53f020b 100644
|
|
--- a/src/gui/kernel/qapplication_x11.cpp
|
|
+++ b/src/gui/kernel/qapplication_x11.cpp
|
|
@@ -1955,9 +1955,9 @@ void qt_init(QApplicationPrivate *priv, int,
|
|
bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
|
|
if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
|
|
Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
|
|
- X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
|
|
- && defaultVisual->green_mask == 0xff00
|
|
- && defaultVisual->blue_mask == 0xff);
|
|
+ X11->use_mitshm = defaultVisual->red_mask == 0xff0000
|
|
+ && defaultVisual->green_mask == 0xff00
|
|
+ && defaultVisual->blue_mask == 0xff;
|
|
}
|
|
}
|
|
#endif // QT_NO_MITSHM
|
|
--
|
|
1.6.5.1
|
|
|