diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:38 +0100 |
| commit | 80d6ea6cac5ece4e3053ec19810abceb77feb4da (patch) | |
| tree | 0dcf4b16d54cc7b3773a3edd2c10df04dfaed0da /src | |
| parent | efc8d3101b8f42e9e29043bae1139505fd3eea38 (diff) | |
| parent | 4a23bbcb19fa2d7958f523ce50ae1a143f5bec14 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If08e856e0de436395382ef141b55f8d1e984535f
Diffstat (limited to 'src')
| -rw-r--r-- | src/androidextras/androidextras.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/androidextras/androidextras.pro b/src/androidextras/androidextras.pro index 78bd8eb..7b5d218 100644 --- a/src/androidextras/androidextras.pro +++ b/src/androidextras/androidextras.pro @@ -5,6 +5,7 @@ QMAKE_DOCS = \ QT -= gui QT += core-private -load(qt_module) include(jni/jni.pri) include(android/android.pri) + +load(qt_module) |