summaryrefslogtreecommitdiffstats
path: root/tools/qvfb/qvfb.cpp
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2009-10-02 10:53:47 (GMT)
committerJeremy Katz <jeremy.katz@nokia.com>2009-10-02 10:58:17 (GMT)
commit1eafe0ea2ecc3bce733d574f39bc26652baaec38 (patch)
tree6f66f6798f84183c7743e517199579a6eb1b0732 /tools/qvfb/qvfb.cpp
parenta586b10bfbf2540e282568b99a4facefa4f24853 (diff)
downloadQt-1eafe0ea2ecc3bce733d574f39bc26652baaec38.zip
Qt-1eafe0ea2ecc3bce733d574f39bc26652baaec38.tar.gz
Qt-1eafe0ea2ecc3bce733d574f39bc26652baaec38.tar.bz2
make private qws/qvfb data directory non-default, default to non-user specific
This turns the changes in 072e748adbdab1d51b240b9983ce82b213b66f18 off by default. Define QT_PRIVATE_QWS to turn them on. This must be done for both qvfb (X11 build) and libQtGui (QWS build). Failure to do so will result in an inability for applications to communicate with the server. Task-number: QTBUG-1711 Reviewed-by: Paul
Diffstat (limited to 'tools/qvfb/qvfb.cpp')
-rw-r--r--tools/qvfb/qvfb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 6119419..59e8dae 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -135,7 +135,7 @@ static const char *red_off_led_xpm[] = {
static bool copyButtonConfiguration(const QString &prefix, int displayId)
{
- const QString destDir = QT_VFB_DATADIR(displayId);
+ const QString destDir = QT_VFB_DATADIR(displayId).append("/");
const QFileInfo src(prefix + QLatin1String("defaultbuttons.conf"));
const QFileInfo dst(destDir + QLatin1String("defaultbuttons.conf"));
unlink(dst.absoluteFilePath().toLatin1().constData());