AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fdd15b7f99
qt5base-lts/mkspecs
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-g++ Updated license headers 2016-01-15 12:25:24 +00:00
aix-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
aix-xlc Updated license headers 2016-01-15 12:25:24 +00:00
aix-xlc-64 Updated license headers 2016-01-15 12:25:24 +00:00
android-clang Android: Add support for clang compiler 2016-07-20 16:53:10 +00:00
android-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
common Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
cygwin-g++ Updated license headers 2016-01-15 12:25:24 +00:00
darwin-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
devices Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
features Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
freebsd-clang Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
freebsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
haiku-g++ Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpux-acc-o64 Updated license headers 2016-01-15 12:25:24 +00:00
hpux-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpux-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hpuxi-acc-32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpuxi-acc-64 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
hpuxi-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
hurd-g++ Updated license headers 2016-01-15 12:25:24 +00:00
integrity-armv7 Add INTEGRITY Framebuffer-based plugin as a platform plugin. 2016-03-22 10:42:03 +00:00
integrity-armv7-imx6 Add support for INTEGRITY with eglfs-viv. 2016-03-22 10:45:31 +00:00
integrity-x86 Add INTEGRITY Framebuffer-based plugin as a platform plugin. 2016-03-22 10:42:03 +00:00
irix-cc Updated license headers 2016-01-15 12:25:24 +00:00
irix-cc-64 Updated license headers 2016-01-15 12:25:24 +00:00
irix-g++ Updated license headers 2016-01-15 12:25:24 +00:00
irix-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-arm-gnueabi-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-clang Updated license headers 2016-01-15 12:25:24 +00:00
linux-clang-libc++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-cxx Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++-32 Updated license headers 2016-01-15 12:25:24 +00:00
linux-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc-32 Updated license headers 2016-01-15 12:25:24 +00:00
linux-icc-64 Updated license headers 2016-01-15 12:25:24 +00:00
linux-kcc Updated license headers 2016-01-15 12:25:24 +00:00
linux-llvm Updated license headers 2016-01-15 12:25:24 +00:00
linux-lsb-g++ Updated license headers 2016-01-15 12:25:24 +00:00
linux-pgcc Updated license headers 2016-01-15 12:25:24 +00:00
lynxos-g++ Updated license headers 2016-01-15 12:25:24 +00:00
macx-clang Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-clang-32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-g++40 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-g++42 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-g++-32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-icc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
macx-ios-clang Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-llvm Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
macx-xcode Updated license headers 2016-01-15 12:25:24 +00:00
modules Adjust wiki links to the new redirect 2015-03-04 15:36:12 +00:00
netbsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-04 15:58:39 +02:00
openbsd-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
qnx-aarch64le-qcc Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qnx-armle-v7-qcc Updated license headers 2016-01-15 12:25:24 +00:00
qnx-x86-64-qcc Add some 64-bit QNX platforms 2016-06-22 14:59:26 +00:00
qnx-x86-qcc Updated license headers 2016-01-15 12:25:24 +00:00
sco-cc Updated license headers 2016-01-15 12:25:24 +00:00
sco-g++ Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-64 Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-64-stlport Updated license headers 2016-01-15 12:25:24 +00:00
solaris-cc-stlport Updated license headers 2016-01-15 12:25:24 +00:00
solaris-g++ Updated license headers 2016-01-15 12:25:24 +00:00
solaris-g++-64 Updated license headers 2016-01-15 12:25:24 +00:00
tru64-cxx Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
tru64-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-23 10:29:37 +02:00
unixware-cc Updated license headers 2016-01-15 12:25:24 +00:00
unixware-g++ Updated license headers 2016-01-15 12:25:24 +00:00
unsupported Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
win32-clang-msvc2015 Add initial clang-cl support to Qt 2016-02-11 12:54:06 +00:00
win32-g++ Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
win32-icc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-23 08:29:43 +01:00
win32-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2010 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2012 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
win32-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
wince60standard-armv4i-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
wince60standard-x86-msvc2005 Updated license headers 2016-01-15 12:25:24 +00:00
wince70embedded-armv4i-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
wince70embedded-x86-msvc2008 Updated license headers 2016-01-15 12:25:24 +00:00
wince80colibri-armv7-msvc2012 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
winphone-arm-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winphone-x86-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-arm-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-arm-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x64-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x64-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x86-msvc2013 Updated license headers 2016-01-15 12:25:24 +00:00
winrt-x86-msvc2015 Updated license headers 2016-01-15 12:25:24 +00:00