diff options
| author | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
|---|---|---|
| committer | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
| commit | 1053cdc43c88b429df96a57c9b0f14be51a71540 (patch) | |
| tree | 62f68bb172a62aeafaf56f2ee86d46f19fff9a3f /tdecore/kkeyserver_x11.cpp | |
| parent | de1db784f3df1568565b2d1b1a57585b54d2d462 (diff) | |
| parent | fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335 (diff) | |
| download | tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.tar.gz tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kkeyserver_x11.cpp')
| -rw-r--r-- | tdecore/kkeyserver_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index 8fa37ebcf..54df04e60 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -234,7 +234,7 @@ static const TransKey g_rgQtToSymX[] = { '-', XK_KP_Subtract }, { '+', XK_KP_Add }, { Qt::Key_Return, XK_KP_Enter } -#if QT_VERSION >= 0x030100 +#if TQT_VERSION >= 0x030100 // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special // multimedia keys. They are included here as not every system has them. |