| Trolltech Home | Qt4-preview-feedback Home | Recent Threads | All Threads | Author | Date | |
| All threads index page 1 | |
Current snapshots fail to compile because XcursorLibraryLoadCursor isn't defined in qapplication_x11.cpp if neither QT_NO_XCURSOR nor QT_RUNTIME_XCURSOR is defined. Fix attached.
--- qt-copy/src/gui/kernel/qapplication_x11.cpp.ark 2008-02-16 19:15:34.000000000 +0100
--- qt-copy/src/gui/kernel/qapplication_x11.cpp.ark 2008-02-16 19:15:34.000000000 +0100
+++ qt-copy/src/gui/kernel/qapplication_x11.cpp 2008-02-16 19:19:27.000000000 +0100
@@ -112,6 +112,10 @@
#include <X11/keysymdef.h>
#include <X11/extensions/XI.h>
+#if !defined(QT_NO_XCURSOR) && !defined(QT_RUNTIME_XCURSOR)
+#include <X11/Xcursor/Xcursor.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -1841,7 +1845,7 @@
(PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
}
#else
- ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
+ X11->ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
#endif // QT_RUNTIME_XCURSOR
#endif // QT_NO_XCURSOR
Bernhard Rosenkränzer wrote: >Current snapshots fail to compile because XcursorLibraryLoadCursor isn't >defined in qapplication_x11.cpp if neither QT_NO_XCURSOR nor >QT_RUNTIME_XCURSOR is defined. > >Fix attached. Thanks Bero, but we've already applied a slightly different patch. David Faure sent it on Thursday. The snapshots are fixed already. Qt-copy didn't get the fix yet. -- [ signature omitted ]
Attachment:
signature.asc
Description: This is a digitally signed message part.