AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6c5de416c9
qt5base-lts/mkspecs/common
History
Edward Welbourne 6c5de416c9 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery.  Made its addition to the other's.

	src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has.  Discarded the #undef part.

	src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.

	src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.

Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
2016-07-26 10:43:29 +02:00
..
aix Updated license headers 2016-01-15 12:25:24 +00:00
android Updated license headers 2016-01-15 12:25:24 +00:00
bsd Common BSD: Add --gc-sections ld flags 2016-06-15 19:17:35 +00:00
c89 Updated license headers 2016-01-15 12:25:24 +00:00
integrity Build SQLite including the platform header for INTEGRITY. 2016-03-23 15:38:27 +00:00
ios Updated license headers 2016-01-15 12:25:24 +00:00
mac Updated license headers 2016-01-15 12:25:24 +00:00
nacl Updated license headers 2016-01-15 12:25:24 +00:00
posix Updated license headers 2016-01-15 12:25:24 +00:00
qnx Updated license headers 2016-01-15 12:25:24 +00:00
wince Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
winrt_winphone Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-04 15:58:39 +02:00
android-base-head.conf Android: Add support for clang compiler 2016-07-20 16:53:10 +00:00
android-base-tail.conf Android: Add support for clang compiler 2016-07-20 16:53:10 +00:00
angle.conf Rename ANGLE libs in order to not conflict with other ANGLE libs 2015-12-01 12:28:02 +00:00
clang-mac.conf Distinguish between Objective-C and Objective-C++ sources 2015-10-09 15:15:17 +00:00
clang.conf Fix the naming of an LLVM tool in common/clang.conf 2016-07-02 16:35:01 +00:00
g++-base.conf Update mkspecs to use "c++11" instead of "c++0x" 2015-10-18 04:46:45 +00:00
g++-macx.conf Remove the -load_all option from the linker enabling static builds 2015-01-07 09:57:07 +01:00
g++-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++.conf Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
gcc-base-mac.conf Distinguish between Objective-C and Objective-C++ sources 2015-10-09 15:15:17 +00:00
gcc-base-unix.conf Add a linker version script to Qt libraries 2015-09-13 18:54:17 +00:00
gcc-base.conf configure: Add support for detecting AVX512 instructions 2015-09-25 20:29:22 +00:00
ghs-base.conf Enable thread_local support for GHS toolchain. 2016-04-13 08:14:48 +00:00
ghs-integrity-armv7.conf Add support for building for INTEGRITY using GHS toolchain. 2016-03-21 16:49:54 +00:00
ghs-integrity-x86.conf Add support for building for INTEGRITY using GHS toolchain. 2016-03-21 16:49:54 +00:00
ios.conf Generalize iOS simulator and device exclusive build 2016-02-12 18:43:31 +00:00
linux-android.conf purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
linux.conf support relative paths in QMAKE_RPATHDIR 2015-10-20 17:18:16 +00:00
llvm.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
mac.conf Set library strip flags on Apple platforms 2016-07-13 16:50:47 +00:00
macx.conf Update for the newest Darwin-family operating systems. 2016-06-15 05:52:47 +00:00
msvc-base.conf msvc: Introduce base config file for all targets 2015-11-30 14:29:44 +00:00
msvc-desktop.conf Silence cl.exe warning about -arch:SSE2 being unknown in 64-bit builds 2015-12-05 00:10:35 +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 qt_poll: split out into separate file and sanitize build 2015-12-05 00:47:36 +00:00
qcc-base.conf Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
sanitize.conf Add support for gcc/clang's sanitize features 2014-10-02 19:45:00 +02:00
shell-unix.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
shell-win32.conf centralize setup of shell-related variables in spec_post.prf 2015-03-06 19:08:40 +00:00
unix.conf unify handling of library prefixes and extensions 2015-10-01 16:19:30 +00:00