diff options
| author | mae <qt-info@nokia.com> | 2011-04-29 09:44:43 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2011-04-29 09:44:43 (GMT) |
| commit | 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5 (patch) | |
| tree | 15e8c0132ac06a9614d69e909c233ef811f17aa2 /src/gui/kernel | |
| parent | c85c1ea36cd9ebe6a9ff970d7ba0ce8d08d5b27b (diff) | |
| download | Qt-31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5.zip Qt-31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5.tar.gz Qt-31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5.tar.bz2 | |
Reduce open and stat system calls for QSettings
The patch moves the global static QSettings object
from QLibrary to QCoreApplication and reduces a
few stat and open calls.
Without the patch, a large Trolltech.conf was
pushed out of the unused settings cache during
startup, meaning Trolltech.conf was parsed
more than once.
Reviewed-by: Liang Qi
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcursor_x11.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp index d0ed98e..0bc7250 100644 --- a/src/gui/kernel/qcursor_x11.cpp +++ b/src/gui/kernel/qcursor_x11.cpp @@ -55,6 +55,9 @@ #endif // QT_NO_XCURSOR #ifndef QT_NO_XFIXES +#ifndef Status +#define Status int +#endif # include <X11/extensions/Xfixes.h> #endif // QT_NO_XFIXES |