diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
| commit | e658bcb0e64acca9684f0897510d639af98ab552 (patch) | |
| tree | 5f2f155093238f0b6e808bc0d6cb54b3bf0b6c4f /tools/qvfb/qvfbshmem.cpp | |
| parent | bb35c5aaa2ad80eaa7f88df6d83945adbf9bde92 (diff) | |
| parent | 1ffaf40f5cffca57d7e116d61935ccd034239222 (diff) | |
| download | Qt-e658bcb0e64acca9684f0897510d639af98ab552.zip Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.gz Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'tools/qvfb/qvfbshmem.cpp')
| -rw-r--r-- | tools/qvfb/qvfbshmem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp index 8c4cdb9..5a2da0d 100644 --- a/tools/qvfb/qvfbshmem.cpp +++ b/tools/qvfb/qvfbshmem.cpp @@ -128,7 +128,9 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, if ( logname ) username = logname; - QString oldPipe = "/tmp/qtembedded-" + username + "/" + QString(QTE_PIPE).arg(displayid); + qws_dataDir(displayid); + + QString oldPipe = "/tmp/qtembedded-" + username + "/" + QString("QtEmbedded-%1").arg(displayid); int oldPipeSemkey = ftok(oldPipe.toLatin1().constData(), 'd'); if (oldPipeSemkey != -1) { int oldPipeLockId = semget(oldPipeSemkey, 0, 0); @@ -149,7 +151,7 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, } } - displayPipe = qws_dataDir(displayid).append(QTE_PIPE); + displayPipe = QTE_PIPE_QVFB(displayid); kh = new QVFbKeyPipeProtocol(displayid); /* should really depend on receiving qt version, but how can |