diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
| commit | 44279fd56aa28d4943b49e516ac791900c561488 (patch) | |
| tree | 11289e75f32c5324c5f7469141881720af4f57fe /opensuse/core/tqt3/fix-xinput-clash.diff | |
| parent | 48e7f603b222a82ae22d94ecbd6cbba914144f86 (diff) | |
| download | tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.tar.gz tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.zip | |
initial package (failing) of tqt3 for SuSE12.1
Diffstat (limited to 'opensuse/core/tqt3/fix-xinput-clash.diff')
| -rw-r--r-- | opensuse/core/tqt3/fix-xinput-clash.diff | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/opensuse/core/tqt3/fix-xinput-clash.diff b/opensuse/core/tqt3/fix-xinput-clash.diff new file mode 100644 index 000000000..0efdb5d7e --- /dev/null +++ b/opensuse/core/tqt3/fix-xinput-clash.diff @@ -0,0 +1,43 @@ +Index: src/kernel/qtaddons_x11.cpp +=================================================================== +--- src/kernel/qtaddons_x11.cpp.orig ++++ src/kernel/qtaddons_x11.cpp +@@ -22,6 +22,10 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifndef TQT_CLEAN_NAMESPACE ++#define TQT_CLEAN_NAMESPACE ++#endif ++ + #include "qt_x11_p.h" + + #if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2) +Index: src/kernel/qt_x11_p.h +=================================================================== +--- src/kernel/qt_x11_p.h.orig ++++ src/kernel/qt_x11_p.h +@@ -86,7 +86,7 @@ + + + // the wacom tablet (currently just the IRIX version) +-#if defined (QT_TABLET_SUPPORT) ++#if defined (QT_TABLET_SUPPORT) && defined (TQT_CLEAN_NAMESPACE) + # include <X11/extensions/XInput.h> + #if defined (Q_OS_IRIX) + # include <wacom.h> // wacom driver defines for IRIX (quite handy) +Index: src/kernel/qwidget_x11.cpp +=================================================================== +--- src/kernel/qwidget_x11.cpp.orig ++++ src/kernel/qwidget_x11.cpp +@@ -38,6 +38,10 @@ + ** + **********************************************************************/ + ++#ifndef TQT_CLEAN_NAMESPACE ++#define TQT_CLEAN_NAMESPACE ++#endif ++ + #include "ntqapplication.h" + #include "qapplication_p.h" + #include "ntqnamespace.h" |