diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2011-04-01 10:11:19 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-04-01 10:11:19 (GMT) |
| commit | bbab5a5dd8274aadc15ef209a08632fde8baeee0 (patch) | |
| tree | 4284d488d8a21770a89f63041cd0925da2af5084 | |
| parent | 777e1c5a18ba1d738d2394d157c2cc27d88ba3f5 (diff) | |
| download | Qt-bbab5a5dd8274aadc15ef209a08632fde8baeee0.zip Qt-bbab5a5dd8274aadc15ef209a08632fde8baeee0.tar.gz Qt-bbab5a5dd8274aadc15ef209a08632fde8baeee0.tar.bz2 | |
Manually amend latin1 change
The result of QLatin1String + QLatin1String is a QStringBuilder object,
not a QString. Fall back to QString.arg(). Patch by Ritt Konstantin.
| -rw-r--r-- | src/gui/embedded/qvfbhdr.h | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/gui/embedded/qvfbhdr.h b/src/gui/embedded/qvfbhdr.h index edbea53..84f82ac 100644 --- a/src/gui/embedded/qvfbhdr.h +++ b/src/gui/embedded/qvfbhdr.h @@ -57,21 +57,32 @@ QT_MODULE(Gui) #endif #ifdef QT_PRIVATE_QWS -#define QT_VFB_DATADIR(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/qtembedded-") \ - + QString::number(getuid()) + QLatin1Char('-') + QString::number(DISPLAY) -#define QT_VFB_MOUSE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/qtvfb_mouse") -#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/qtvfb_keyboard") -#define QT_VFB_MAP(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/qtvfb_map") -#define QT_VFB_SOUND_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/qt_soundserver") -#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/QtEmbedded") +#define QT_VFB_DATADIR(DISPLAY) QString::fromLatin1("%1/qtembedded-%2-%3") \ + .arg(QT_QWS_TEMP_DIR).arg(getuid()).arg(DISPLAY) +#define QT_VFB_MOUSE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/qtvfb_mouse")) +#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/qtvfb_keyboard")) +#define QT_VFB_MAP(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/qtvfb_map")) +#define QT_VFB_SOUND_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/qt_soundserver")) +#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/QtEmbedded")) #define QTE_PIPE_QVFB(DISPLAY) QTE_PIPE(DISPLAY) #else -#define QT_VFB_DATADIR(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/qtembedded-") + QString::number(DISPLAY) -#define QT_VFB_MOUSE_PIPE(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/.qtvfb_mouse-") + QString::number(DISPLAY) -#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/.qtvfb_keyboard-") + QString::number(DISPLAY) -#define QT_VFB_MAP(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/.qtvfb_map-") + QString::number(DISPLAY) -#define QT_VFB_SOUND_PIPE(DISPLAY) QT_QWS_TEMP_DIR + QLatin1String("/.qt_soundserver-") + QString::number(DISPLAY) -#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) + QLatin1String("/QtEmbedded-") + QString::number(DISPLAY) +#define QT_VFB_DATADIR(DISPLAY) QString::fromLatin1("%1/qtembedded-%2") \ + .arg(QT_QWS_TEMP_DIR).arg(DISPLAY) +#define QT_VFB_MOUSE_PIPE(DISPLAY) QString::fromLatin1("%1/.qtvfb_mouse-%2") \ + .arg(QT_QWS_TEMP_DIR).arg(DISPLAY) +#define QT_VFB_KEYBOARD_PIPE(DISPLAY) QString::fromLatin1("%1/.qtvfb_keyboard-%2") \ + .arg(QT_QWS_TEMP_DIR).arg(DISPLAY) +#define QT_VFB_MAP(DISPLAY) QString::fromLatin1("%1/.qtvfb_map-%2") \ + .arg(QT_QWS_TEMP_DIR).arg(DISPLAY) +#define QT_VFB_SOUND_PIPE(DISPLAY) QString::fromLatin1("%1/.qt_soundserver-%2") \ + .arg(QT_QWS_TEMP_DIR).arg(DISPLAY) +#define QTE_PIPE(DISPLAY) QT_VFB_DATADIR(DISPLAY) \ + .append(QLatin1String("/QtEmbedded-%1")).arg(DISPLAY) #define QTE_PIPE_QVFB(DISPLAY) QTE_PIPE(DISPLAY) #endif |