diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
| commit | f4900d340a4c620b56871995741696d28e53c167 (patch) | |
| tree | 66d4ed6e4e8012e8a534717e87bf15cf8a992652 /src/gui/kernel/qguiapplication.cpp | |
| parent | 7c33ae6a7bbbd42ce70acf77aa55c1bc2a23c8ec (diff) | |
| parent | 843de37bca944110fdf3aab161d680e3845d2dd2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qmacstyle_mac.mm
Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 3a8428b332..89b3b9ab89 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -60,7 +60,9 @@ #include <QtCore/private/qthread_p.h> #include <QtCore/qdir.h> #include <QtDebug> +#ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" +#endif #include <qpalette.h> #include <qscreen.h> #include "qsessionmanager.h" |