AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7555a92581
qt5base-lts/config.tests/unix
History
Liang Qi 7555a92581 Merge remote-tracking branch 'origin/5.7' into 5.8 
5971b88e is not needed in new configure.

This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with
apple SDK", 2c9d15d7, because it breaks iOS build with new
configure system.

Conflicts:
	mkspecs/features/default_pre.prf
	mkspecs/features/mac/toolchain.prf
	mkspecs/features/toolchain.prf
	src/dbus/qdbusconnection.cpp
	src/plugins/sqldrivers/mysql/qsql_mysql.cpp
	src/sql/drivers/mysql/qsql_mysql.cpp
	src/widgets/widgets/qmenubar.cpp
	src/widgets/widgets/qmenubar_p.h
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp
	tools/configure/environment.h

Change-Id: I995533dd334211ebd25912db05b639d6f908aaec
2016-09-21 11:57:52 +02:00
..
alsa rewrite library handling in configure 2016-08-18 17:09:52 +00: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 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
db2 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
dbus rewrite library handling in configure 2016-08-18 17:09:52 +00:00
dlopen Fix dynamic librariy support detection for platforms without libdl 2016-05-19 10:15:42 +00:00
doubleconversion rewrite library handling in configure 2016-08-18 17:09:52 +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 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
freetype rewrite library handling in configure 2016-08-18 17:09:52 +00:00
getaddrinfo rewrite library handling in configure 2016-08-18 17:09:52 +00:00
getifaddrs rewrite library handling in configure 2016-08-18 17:09:52 +00:00
glib Updated license headers 2016-01-15 12:25:24 +00:00
gnu-libiconv rewrite library handling in configure 2016-08-18 17:09:52 +00:00
gstreamer rewrite library handling in configure 2016-08-18 17:09:52 +00:00
harfbuzz rewrite library handling in configure 2016-08-18 17:09:52 +00:00
ibase rewrite library handling in configure 2016-08-18 17:09:52 +00:00
iconv Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
icu rewrite library handling in configure 2016-08-18 17:09:52 +00:00
inotify 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 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
journald rewrite library handling in configure 2016-08-18 17:09:52 +00:00
lgmon rewrite library handling in configure 2016-08-18 17:09:52 +00:00
libinput rewrite library handling in configure 2016-08-18 17:09:52 +00:00
libjpeg Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
libpng rewrite library handling in configure 2016-08-18 17:09:52 +00:00
libudev rewrite library handling in configure 2016-08-18 17:09:52 +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 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
mysql rewrite library handling in configure 2016-08-18 17:09:52 +00:00
objcopy Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
oci rewrite library handling in configure 2016-08-18 17:09:52 +00:00
odbc rewrite library handling in configure 2016-08-18 17:09:52 +00:00
opengldesktop rewrite library handling in configure 2016-08-18 17:09:52 +00:00
opengles2 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
opengles3 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
opengles31 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
openssl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
pcre rewrite library handling in configure 2016-08-18 17:09:52 +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 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
psql rewrite library handling in configure 2016-08-18 17:09:52 +00:00
pulseaudio rewrite library handling in configure 2016-08-18 17:09:52 +00:00
qqnx_imf rewrite library handling in configure 2016-08-18 17:09:52 +00:00
reduce_exports get rid of test type 'shell' 2016-08-12 22:04:50 +00:00
reduce_relocs get rid of test type 'shell' 2016-08-12 22:04:50 +00:00
sctp rewrite library handling in configure 2016-08-18 17:09:52 +00:00
slog2 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
sqlite Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-29 10:10:22 +02:00
sqlite2 rewrite library handling in configure 2016-08-18 17:09:52 +00:00
stl Updated license headers 2016-01-15 12:25:24 +00:00
sun-libiconv
syslog Updated license headers 2016-01-15 12:25:24 +00:00
tds rewrite library handling in configure 2016-08-18 17:09:52 +00:00
tslib rewrite library handling in configure 2016-08-18 17:09:52 +00:00
xkbcommon Updated license headers 2016-01-15 12:25:24 +00:00
zlib rewrite library handling in configure 2016-08-18 17:09:52 +00:00
which.test