AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69ef0481fc
qt5base-lts/config.tests/unix
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
..
alsa Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
clock-gettime Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
clock-monotonic Updated license headers 2016-01-15 12:25:24 +00:00
cloexec Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-29 10:10:22 +02:00
cups Updated license headers 2016-01-15 12:25:24 +00:00
db2 Updated license headers 2016-01-15 12:25:24 +00:00
dbus Updated license headers 2016-01-15 12:25:24 +00:00
dlopen Fix dynamic librariy support detection for platforms without libdl 2016-05-19 10:15:42 +00:00
doubleconversion Updated license headers 2016-01-15 12:25:24 +00:00
evdev Updated license headers 2016-01-15 12:25:24 +00:00
eventfd Update the Intel copyright year 2016-01-21 22:44:16 +00:00
fontconfig Updated license headers 2016-01-15 12:25:24 +00:00
freetype Support color font rendering for freetype engine 2016-05-03 22:58:49 +00:00
getaddrinfo Updated license headers 2016-01-15 12:25:24 +00:00
getifaddrs Updated license headers 2016-01-15 12:25:24 +00:00
glib Updated license headers 2016-01-15 12:25:24 +00:00
gnu-libiconv Updated license headers 2016-01-15 12:25:24 +00:00
gstreamer Updated license headers 2016-01-15 12:25:24 +00:00
harfbuzz Updated license headers 2016-01-15 12:25:24 +00:00
ibase Updated license headers 2016-01-15 12:25:24 +00:00
iconv Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
icu Updated license headers 2016-01-15 12:25:24 +00:00
inotify Updated license headers 2016-01-15 12:25:24 +00:00
iodbc Updated license headers 2016-01-15 12:25:24 +00:00
ipc_posix Updated license headers 2016-01-15 12:25:24 +00:00
ipc_sysv Updated license headers 2016-01-15 12:25:24 +00:00
ipv6ifname Updated license headers 2016-01-15 12:25:24 +00:00
javascriptcore-jit Updated license headers 2016-01-15 12:25:24 +00:00
journald Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
lgmon Updated license headers 2016-01-15 12:25:24 +00:00
libdl Fix dynamic librariy support detection for platforms without libdl 2016-05-19 10:15:42 +00:00
libinput Updated license headers 2016-01-15 12:25:24 +00:00
libjpeg Updated license headers 2016-01-15 12:25:24 +00:00
libpng Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-29 10:10:22 +02:00
libudev Updated license headers 2016-01-15 12:25:24 +00:00
mips_dsp Updated license headers 2016-01-15 12:25:24 +00:00
mips_dspr2 Updated license headers 2016-01-15 12:25:24 +00:00
mremap Updated license headers 2016-01-15 12:25:24 +00:00
mtdev Updated license headers 2016-01-15 12:25:24 +00:00
mysql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
mysql_r Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
objcopy Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
oci Updated license headers 2016-01-15 12:25:24 +00:00
odbc Updated license headers 2016-01-15 12:25:24 +00:00
opengldesktop Updated license headers 2016-01-15 12:25:24 +00:00
opengles2 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
opengles3 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
opengles31 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
openssl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
openvg Updated license headers 2016-01-15 12:25:24 +00:00
pcre Updated license headers 2016-01-15 12:25:24 +00:00
poll Updated license headers 2016-01-15 12:25:24 +00:00
pollts Updated license headers 2016-01-15 12:25:24 +00:00
posix_fallocate Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-29 10:10:22 +02:00
ppoll Updated license headers 2016-01-15 12:25:24 +00:00
pps Updated license headers 2016-01-15 12:25:24 +00:00
psql Updated license headers 2016-01-15 12:25:24 +00:00
pulseaudio Updated license headers 2016-01-15 12:25:24 +00:00
qqnx_imf Updated license headers 2016-01-15 12:25:24 +00:00
shivavg Updated license headers 2016-01-15 12:25:24 +00:00
slog2 Updated license headers 2016-01-15 12:25:24 +00:00
sqlite Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-29 10:10:22 +02:00
sqlite2 Updated license headers 2016-01-15 12:25:24 +00:00
stdint Updated license headers 2016-01-15 12:25:24 +00:00
stl Updated license headers 2016-01-15 12:25:24 +00:00
sun-libiconv Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
syslog Updated license headers 2016-01-15 12:25:24 +00:00
tds Updated license headers 2016-01-15 12:25:24 +00:00
tslib Updated license headers 2016-01-15 12:25:24 +00:00
xkbcommon Updated license headers 2016-01-15 12:25:24 +00:00
zlib Updated license headers 2016-01-15 12:25:24 +00:00
arch.test configure: Separate host and build platform. 2015-10-30 13:14:51 +00:00
bsymbolic_functions.test Do not use -Bsymbolic* on anything but x86 and x86-64 2014-03-25 00:00:23 +01:00
compile.test Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
fvisibility.test Enable symbol visibility support on QNX 2012-08-27 10:50:35 +02:00
precomp.test Fix enabling of precompiled headers on macOS 2016-07-25 20:23:13 +00:00
which.test Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00