AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8eb721468e
qt5base-lts/tests/auto
History
Liang Qi 50d0f57b77 Merge remote-tracking branch 'origin/5.6' into 5.7 
This change partially reverts 1bfc7f68 about QT_HAS_BUILTIN define
and undef in src/corelib/tools/qsimd_p.h.

This change is also squashed with "Fall back to c++11 standard
compiler flag for host builds" which is done by Peter Seiderer.

Conflicts:
	mkspecs/features/default_post.prf
	src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch
	src/3rdparty/sqlite/sqlite3.c
	src/corelib/tools/qsimd_p.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/bearer/blackberry/blackberry.pro
	src/plugins/platforms/cocoa/qcocoasystemsettings.mm
	src/plugins/platformthemes/gtk2/gtk2.pro
	src/plugins/styles/bb10style/bb10style.pro
	src/sql/drivers/sqlite2/qsql_sqlite2.cpp
	tools/configure/configureapp.cpp

Task-number: QTBUG-51644
Done-with: Peter Seiderer <ps.report@gmx.net>
Change-Id: I6100d6ace31b2e8d41a95f0b5d5ebf8f1fd88b44
2016-03-11 20:08:50 +01:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64 2015-02-14 06:54:20 +00:00
cmake Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent QtConcurrentRun: add unittest for polling for isFinished() 2016-02-15 13:53:57 +00:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
dbus Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake Add a unit test for testing Qt in its install location. 2013-07-02 23:08:54 +02:00
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
opengl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
other Add native support for D-Bus global menu 2016-02-23 20:56:07 +00:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
testlib Make it possible to preserve the library/plugin path in tst_selftest 2016-02-23 21:16:44 +00:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
xml Updated license headers 2016-01-21 18:55:18 +00:00
auto.pro Autotests: if cross-compiling, ignore dbus status on compilation host 2016-02-23 12:19:31 +00:00
network-settings.h Updated license headers 2016-01-21 18:55:18 +00:00
qtest-config.h Updated license headers 2016-01-21 18:55:18 +00:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00