diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 17:05:14 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:14:46 +0100 |
| commit | 5a7c33dece358090bc8fd3b84567d8bcb0e3b630 (patch) | |
| tree | f73931fd2416debfecced1676761aabe48d2f319 /src/corelib/tools/tools.pri | |
| parent | c9908423d33828b15e5ea97bb1ee8deb08f15673 (diff) | |
| parent | e5a6e9bb80fb2427228f70488b8839b4aa0b4261 (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into HEAD
Change-Id: Id3a0e9482b35b5e4c79018e0c547d3c4ff48d9a5
Diffstat (limited to 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index b87255899c..4cd38d67f9 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -161,7 +161,7 @@ qtConfig(timezone) { tools/qtimezoneprivate.cpp !nacl:darwin: \ SOURCES += tools/qtimezoneprivate_mac.mm - else: android: \ + else: android:!android-embedded: \ SOURCES += tools/qtimezoneprivate_android.cpp else: unix: \ SOURCES += tools/qtimezoneprivate_tz.cpp @@ -223,4 +223,3 @@ TR_EXCLUDE += ../3rdparty/* # MIPS DSP MIPS_DSP_ASM += tools/qstring_mips_dsp_asm.S MIPS_DSP_HEADERS += ../gui/painting/qt_mips_asm_dsp_p.h -CONFIG += simd |