From cacfe6183ff7fc3211c92561b7424c0d898e0c4e Mon Sep 17 00:00:00 2001
From: Ritt Konstantin <ritt.ks@gmail.com>
Date: Thu, 31 Mar 2011 13:39:19 +0200
Subject: take the user defined temp dir into account
use user's QT_QWS_TEMP_DIR rather than hardcoded "/tmp" one
Merge-request: 1038
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
---
src/gui/embedded/qvfbhdr.h | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/gui/embedded/qvfbhdr.h b/src/gui/embedded/qvfbhdr.h
index 31704b3..1258f14 100644
--- a/src/gui/embedded/qvfbhdr.h
+++ b/src/gui/embedded/qvfbhdr.h
@@ -74,15 +74,19 @@ QT_MODULE(Gui)
#else
#define QT_VFB_DATADIR(DISPLAY) QString("%1/qtembedded-%2") \
.arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
-#define QT_VFB_MOUSE_PIPE(DISPLAY) QString("/tmp/.qtvfb_mouse-%1").arg(DISPLAY)
-#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QString("/tmp/.qtvfb_keyboard-%1").arg(DISPLAY)
-#define QT_VFB_MAP(DISPLAY) QString("/tmp/.qtvfb_map-%1").arg(DISPLAY)
-#define QT_VFB_SOUND_PIPE(DISPLAY) QString("/tmp/.qt_soundserver-%1").arg(DISPLAY)
+#define QT_VFB_MOUSE_PIPE(DISPLAY) QString("%1/.qtvfb_mouse-%2") \
+ .arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
+#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QString("%1/.qtvfb_keyboard-%2") \
+ .arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
+#define QT_VFB_MAP(DISPLAY) QString("%1/.qtvfb_map-%2") \
+ .arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
+#define QT_VFB_SOUND_PIPE(DISPLAY) QString("%1/.qt_soundserver-%2") \
+ .arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \
.append("/QtEmbedded-%1") \
.arg(DISPLAY)
-#define QTE_PIPE_QVFB(DISPLAY) QString("/tmp/qtembedded-%1/QtEmbedded-%1") \
- .arg(DISPLAY)
+#define QTE_PIPE_QVFB(DISPLAY) QString("%1/qtembedded-%2/QtEmbedded-%2") \
+ .arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
#endif
struct QVFbHeader
--
cgit v0.12