diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:13:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:14:15 +0100 |
| commit | 846cc4c75cc06def67e831c8cb3c9edaef24f8f0 (patch) | |
| tree | cf8cd76a5a610a6264583148b2c0549f7514dde3 /src/plugins/platforms/android/qandroidplatformintegration.cpp | |
| parent | 9e4a215a2569a04010292c8718d0f0569bc06c12 (diff) | |
| parent | 0d0fb04d505d105fb4b2fc71d68f729ce670b12e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformintegration.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 5848e94aca..2cca974b41 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -50,21 +50,20 @@ #include <qpa/qwindowsysteminterface.h> #include <qpa/qplatformwindow.h> -#warning sort the headers #include "androidjnimain.h" #include "qabstracteventdispatcher.h" -#include "qandroidplatformrasterwindow.h" -#include "qandroidplatformopenglwindow.h" #include "qandroidplatformbackingstore.h" -#include "qandroidplatformservices.h" -#include "qandroidplatformfontdatabase.h" -#include "qandroidplatformclipboard.h" #include "qandroidplatformaccessibility.h" +#include "qandroidplatformclipboard.h" +#include "qandroidplatformforeignwindow.h" +#include "qandroidplatformfontdatabase.h" #include "qandroidplatformopenglcontext.h" +#include "qandroidplatformopenglwindow.h" +#include "qandroidplatformrasterwindow.h" #include "qandroidplatformscreen.h" +#include "qandroidplatformservices.h" #include "qandroidplatformtheme.h" #include "qandroidsystemlocale.h" -#include "qandroidplatformforeignwindow.h" QT_BEGIN_NAMESPACE |