diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-16 16:26:06 (GMT) |
| commit | af1fa7fe766980210d7363c1559197f34b10d834 (patch) | |
| tree | e2964649ca8469269950a265060b3d1e7e6026f6 /src/gui/kernel/qgesturerecognizer.h | |
| parent | c5bfbe27f5bbdb1f3e76af8ca5e0f4df27875a06 (diff) | |
| parent | 1433a2c8682cb1c8f89ceaf97ad7a509ac686879 (diff) | |
| download | Qt-af1fa7fe766980210d7363c1559197f34b10d834.zip Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.gz Qt-af1fa7fe766980210d7363c1559197f34b10d834.tar.bz2 | |
Merge branch '4.6'
Conflicts:
translations/assistant_adp_pl.ts
translations/assistant_adp_ru.ts
Diffstat (limited to 'src/gui/kernel/qgesturerecognizer.h')
| -rw-r--r-- | src/gui/kernel/qgesturerecognizer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qgesturerecognizer.h b/src/gui/kernel/qgesturerecognizer.h index c85afd2..efd8565 100644 --- a/src/gui/kernel/qgesturerecognizer.h +++ b/src/gui/kernel/qgesturerecognizer.h @@ -42,7 +42,7 @@ #ifndef QGESTURERECOGNIZER_H #define QGESTURERECOGNIZER_H -#include "qglobal.h" +#include <QtCore/qglobal.h> QT_BEGIN_HEADER |