summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2009-10-05 09:32:10 (GMT)
committerJeremy Katz <jeremy.katz@nokia.com>2009-10-05 09:35:03 (GMT)
commitaf1d916b86295543b8e20be79abf48453d9c55d0 (patch)
tree5dfbb214e664f07316a5cc88099b3c78a0ad162a
parent144273fe9e2280f52f1dba0b5781a54f8b459d1e (diff)
downloadQt-af1d916b86295543b8e20be79abf48453d9c55d0.zip
Qt-af1d916b86295543b8e20be79abf48453d9c55d0.tar.gz
Qt-af1d916b86295543b8e20be79abf48453d9c55d0.tar.bz2
fix creation of qws directory when app start preceeds qvfb
Change authored by Rhys. Bug introduced by the change to allow user-specific cache and pipe directories. Reviewed-by: Jeremy
-rw-r--r--src/gui/embedded/qvfbhdr.h2
-rw-r--r--src/gui/kernel/qapplication_qws.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/embedded/qvfbhdr.h b/src/gui/embedded/qvfbhdr.h
index eff5fc2..73b13d3 100644
--- a/src/gui/embedded/qvfbhdr.h
+++ b/src/gui/embedded/qvfbhdr.h
@@ -70,7 +70,7 @@ QT_MODULE(Gui)
.append("/qt_soundserver")
#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \
.append("/QtEmbedded")
-#define QTE_PIPE_QVFB QTE_PIPE
+#define QTE_PIPE_QVFB(DISPLAY) QTE_PIPE(DISPLAY)
#else
#define QT_VFB_DATADIR(DISPLAY) QString("%1/qtembedded-%2") \
.arg(QT_QWS_TEMP_DIR).arg(DISPLAY)
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 634f23a..167beb2 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -232,6 +232,7 @@ QString qws_dataDir()
// Get the filename of the pipe Qt for Embedded Linux uses for server/client comms
Q_GUI_EXPORT QString qws_qtePipeFilename()
{
+ qws_dataDir();
return QTE_PIPE(qws_display_id);
}