File tree Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
9
9
$(package)_patches =fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
10
10
$(package)_patches+ = fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
11
11
$(package)_patches+ = drop_lrelease_dependency.patch no_sdk_version_check.patch
12
- $(package)_patches+ = fix_qpainter_non_determinism.patch fix_lib_paths.patch
12
+ $(package)_patches+ = fix_qpainter_non_determinism.patch fix_lib_paths.patch fix_android_pch.patch
13
13
14
14
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
15
15
$(package)_qttranslations_sha256_hash =e1de58ed108b7e0a138815ea60fd46a2c4e1fc31396a707e5630e92de79c53de
@@ -224,6 +224,7 @@ define $(package)_preprocess_cmds
224
224
patch -p1 -i $($(package ) _patch_dir) /fix_no_printer.patch && \
225
225
patch -p1 -i $($(package ) _patch_dir) /fix_android_qmake_conf.patch && \
226
226
patch -p1 -i $($(package ) _patch_dir) /fix_android_jni_static.patch && \
227
+ patch -p1 -i $($(package ) _patch_dir) /fix_android_pch.patch && \
227
228
patch -p1 -i $($(package ) _patch_dir) /no-xlib.patch && \
228
229
patch -p1 -i $($(package ) _patch_dir) /fix_qpainter_non_determinism.patch &&\
229
230
patch -p1 -i $($(package ) _patch_dir) /no_sdk_version_check.patch && \
Original file line number Diff line number Diff line change
1
+ --- old/qtbase/mkspecs/common/android-base-head.conf
2
+ +++ new/qtbase/mkspecs/common/android-base-head.conf
3
+ @@ -73,6 +73,6 @@ CROSS_COMPILE = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-
4
+ QMAKE_PCH_OUTPUT_EXT = .gch
5
+
6
+ QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
7
+ - QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE}
8
+ + QMAKE_CFLAGS_USE_PRECOMPILE = -include-pch ${QMAKE_PCH_OUTPUT}
9
+ QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
10
+ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
You can’t perform that action at this time.
0 commit comments