diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
| commit | def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7 (patch) | |
| tree | 09e3aa8d6e3f72f815b1beaf6d59261b5f45acdd /tests/auto/windowsmobile | |
| parent | e689e41ad1baad65d90866eefe88a96f5e16fa04 (diff) | |
| parent | d14fd301314bcceaf2594a5a18f6d20894c1d353 (diff) | |
| download | Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.zip Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.gz Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
tests/auto/windowsmobile/test/tst_windowsmobile.cpp
Diffstat (limited to 'tests/auto/windowsmobile')
| -rw-r--r-- | tests/auto/windowsmobile/test/tst_windowsmobile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp index 4fc870e..2d7c9ea 100644 --- a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp +++ b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp @@ -46,7 +46,7 @@ #include <QtGui> #ifdef Q_OS_WINCE_WM #include <windows.h> -#include <ddhelper.h> +#include "ddhelper.h" #endif |