diff options
| author | Robert Xu <[email protected]> | 2011-11-12 18:13:39 -0500 |
|---|---|---|
| committer | Robert Xu <[email protected]> | 2011-11-12 18:13:39 -0500 |
| commit | cd1f97695be1245ab19058d4fbc34e5697cc5383 (patch) | |
| tree | b265d96856632dc78e566d337f7eff254b6695f7 /opensuse/core/qt3/fix-xinput-clash.diff | |
| parent | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (diff) | |
| download | tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.tar.gz tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.zip | |
fix up tdebase and add qt3
Diffstat (limited to 'opensuse/core/qt3/fix-xinput-clash.diff')
| -rw-r--r-- | opensuse/core/qt3/fix-xinput-clash.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/opensuse/core/qt3/fix-xinput-clash.diff b/opensuse/core/qt3/fix-xinput-clash.diff new file mode 100644 index 000000000..2a7011681 --- /dev/null +++ b/opensuse/core/qt3/fix-xinput-clash.diff @@ -0,0 +1,37 @@ +--- src/kernel/qtaddons_x11.cpp ++++ src/kernel/qtaddons_x11.cpp +@@ -22,6 +22,10 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + ++#ifndef QT_CLEAN_NAMESPACE ++#define QT_CLEAN_NAMESPACE ++#endif ++ + #include "qt_x11_p.h" + + #if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2) +--- src/kernel/qt_x11_p.h ++++ 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 (QT_CLEAN_NAMESPACE) + # include <X11/extensions/XInput.h> + #if defined (Q_OS_IRIX) + # include <wacom.h> // wacom driver defines for IRIX (quite handy) +--- src/kernel/qwidget_x11.cpp ++++ src/kernel/qwidget_x11.cpp +@@ -38,6 +38,10 @@ + ** + **********************************************************************/ + ++#ifndef QT_CLEAN_NAMESPACE ++#define QT_CLEAN_NAMESPACE ++#endif ++ + #include "qapplication.h" + #include "qapplication_p.h" + #include "qnamespace.h" |