AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4a8273a6fc
qt5base-lts/config.tests/unix
History
Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev 
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
2013-11-26 22:35:48 +01:00
..
alsa Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
clock-gettime Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
clock-monotonic Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
cups Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
db2 Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
dbus Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
egl4gles1 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
evdev Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
eventfd Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
floatmath Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
fontconfig Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
freetype Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
getaddrinfo Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
getifaddrs Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
glib Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
gnu-libiconv Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
harfbuzz Add configure options for [experimental] HarfBuzz-NG support 2013-08-27 18:05:08 +02:00
ibase Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
iconv Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
icu Use compile check instead of searching header for ICU 2013-11-14 19:26:20 +01:00
inotify Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
iodbc Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
ipv6ifname Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
iwmmxt Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
javascriptcore-jit Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
libjpeg Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
libpng Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
libudev Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
mips_dsp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
mips_dspr2 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
mremap Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
mysql Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
mysql_r Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
neon Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
nis Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
oci Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
odbc Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
opengldesktop Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
opengles1 Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
opengles2 Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
openssl Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
openvg Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
pcre Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
pps Add PPS configure check 2013-11-23 15:45:35 +01:00
psql Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
ptrsize Detect pointer size at configure-time on Windows-hosted builds 2013-10-22 12:15:57 +02:00
pulseaudio Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qqnx_imf Add configuration for building with imf support on QNX 2013-10-25 20:17:40 +02:00
shivavg Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
slog2 Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
sqlite Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
sqlite2 Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
stdint Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
stl Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
sun-libiconv Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
tds Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
tslib Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
zlib Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
arch.test Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
bsymbolic_functions.test Fix the bsymbolic_functions test and improve the error reporting 2012-03-22 18:59:45 +01:00
compile.test Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
fvisibility.test Enable symbol visibility support on QNX 2012-08-27 10:50:35 +02:00
makeabs turn makeabs into a proper cleanPath() 2013-10-30 23:26:58 +01:00
objcopy.test Improve sysroot handling with regards to configure tests. 2012-02-03 18:59:09 +01:00
precomp.test QNX: Enable pre-compiled header support for QNX 2012-08-27 10:52:20 +02:00
ptrsize.test Disable app_bundle and lib_bundle when running configure tests 2013-07-16 13:44:18 +02:00
which.test Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00