AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93bcd488af
qt5base-lts/mkspecs/common
History
Liang Qi fbfacd33be Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	src/android/templates/AndroidManifest.xml
	src/network/ssl/qsslsocket_mac.cpp
	src/widgets/styles/qstylesheetstyle.cpp
	tests/auto/corelib/kernel/qtimer/BLACKLIST
	tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
	tests/auto/testlib/selftests/expected_blacklisted.lightxml
	tests/auto/testlib/selftests/expected_blacklisted.tap
	tests/auto/testlib/selftests/expected_blacklisted.teamcity
	tests/auto/testlib/selftests/expected_blacklisted.txt
	tests/auto/testlib/selftests/expected_blacklisted.xml
	tests/auto/testlib/selftests/expected_blacklisted.xunitxml
	tests/auto/testlib/selftests/expected_float.tap
	tests/auto/testlib/selftests/expected_float.teamcity
	tests/auto/testlib/selftests/expected_float.txt
	tests/auto/testlib/selftests/expected_float.xunitxml

Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: If93cc432a56ae3ac1b6533d0028e4dc497415a52
2019-02-08 12:31:02 +01:00
..
aix Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
android Add QIODevice::NewOnly and QIODevice::ExistingOnly OpenMode flags 2018-01-17 04:32:47 +00:00
bsd Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
c89 Updated license headers 2016-01-15 12:25:24 +00:00
integrity Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
mac Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
nacl Updated license headers 2016-01-15 12:25:24 +00:00
posix Add QIODevice::NewOnly and QIODevice::ExistingOnly OpenMode flags 2018-01-17 04:32:47 +00:00
qnx Stop including net/if.h from qplatformdefs.h 2017-10-08 06:41:24 +00:00
uikit Merge remote-tracking branch 'origin/5.8' into dev 2016-10-13 09:49:38 +02:00
winrt_winphone Enable users to specify WindowsTargetPlatform[Min]Version in VS projects 2018-11-16 10:55:16 +00:00
android-base-head.conf qmake: prune dead assignments from android spec 2018-11-21 23:07:28 +00:00
android-base-tail.conf qmake: fix QMAKE_DEFAULT_LIBDIRS detection on android 2018-12-03 11:25:47 +00:00
angle.conf Restore behavior of using libEGL and libGLESv2 as default for angle 2017-05-11 08:35:54 +00:00
clang-mac.conf Move Apple-specific -fapplication-extensions option to the mkspec 2017-04-12 03:37:01 +00:00
clang.conf configure: Add switch for adding coverage info 2018-10-31 15:08:59 +00:00
g++-base.conf Detect C standard and try using the most recent one (take 2) 2018-04-21 09:05:14 +00:00
g++-macx.conf
g++-unix.conf
g++-win32.conf qmake: enable rtti config option for g++/clang 2018-12-13 20:51:39 +00:00
g++.conf
gcc-base-mac.conf MinGW: reuse gcc-base.conf and g++-base.conf 2016-11-29 16:23:58 +00:00
gcc-base-unix.conf Add llvm linker detection to configure 2019-02-06 22:11:22 +00:00
gcc-base.conf qmake: enable rtti config option for g++/clang 2018-12-13 20:51:39 +00:00
ghs-base.conf Remove QMAKE_LIBS_CORE variable 2017-08-28 13:10:38 +00:00
ghs-integrity-armv7.conf Add -bigswitch on INTEGRITY 2017-04-03 08:08:46 +00:00
ghs-integrity-armv8.conf Disable NEON flags from Integrity compiler 2019-01-25 11:15:04 +00:00
ghs-integrity-x86.conf Add support for building for INTEGRITY using GHS toolchain. 2016-03-21 16:49:54 +00:00
icc-base-unix.conf Update the ICC x86 sub-architecture compiler options 2018-06-23 20:16:35 +00:00
ios.conf Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
linux.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
llvm.conf
mac.conf Fix resolving of libraries on Apple platforms 2019-01-13 18:17:43 +00:00
macx.conf macOS: Explicitly define lower bound for supported SDK version 2018-10-26 08:54:22 +00:00
msvc-based-version.conf Fix build with win32-clang-msvc and win32-icc 2018-12-14 18:20:26 +00:00
msvc-desktop.conf Merge remote-tracking branch 'origin/5.12' into dev 2018-12-04 09:58:43 +01:00
msvc-version.conf Fix build with win32-clang-msvc and win32-icc 2018-12-14 18:20:26 +00:00
qcc-base-qnx-aarch64le.conf Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qcc-base-qnx-armle-v7.conf move inclusions of unix.conf (and related files) near the top 2015-10-01 16:19:27 +00:00
qcc-base-qnx-x86-64.conf Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qcc-base-qnx-x86.conf move inclusions of unix.conf (and related files) near the top 2015-10-01 16:19:27 +00:00
qcc-base-qnx.conf qmake: add support for mkspecs which don't support strict_c++ 2018-04-05 18:55:46 +00:00
qcc-base.conf Merge remote-tracking branch 'origin/5.9' into dev 2017-06-19 16:12:34 +02:00
sanitize.conf
shell-unix.conf
shell-win32.conf
solaris.conf Remove unused mkspecs variable QMAKE_LIBS_NIS 2017-08-28 13:10:44 +00:00
tvos.conf qmake: enable bitcode also for iOS 2016-08-19 21:06:05 +00:00
uikit.conf Remove useless DARWIN_NO_CARBON define from uikit mkspecs 2017-01-24 19:40:29 +00:00
unix.conf unify handling of library prefixes and extensions 2015-10-01 16:19:30 +00:00
watchos.conf qmake: enable bitcode also for iOS 2016-08-19 21:06:05 +00:00
windows-desktop.conf Enable users to specify WindowsTargetPlatform[Min]Version in VS projects 2018-11-16 10:55:16 +00:00
windows-vulkan.conf Fix WebEngine build when VULKAN_SDK environment variable is present 2017-07-25 13:48:41 +00:00