AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bc5f45052f
qt5base-lts/tests/auto
History
Liang Qi bc5f45052f Merge remote-tracking branch 'origin/5.9' into 5.10 
Conflicts:
	src/corelib/global/qconfig-bootstrapped.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qcryptographichash.cpp
	src/corelib/tools/qcryptographichash.h
	src/corelib/tools/qmessageauthenticationcode.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST

Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a
2017-10-04 13:41:04 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data Update binary compatibility files for Qt 5.9.0 for QtBase 2017-08-14 13:48:17 +00:00
cmake tests: Unify license to GPL-EXCEPT 2017-04-03 07:18:46 +00:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00
corelib qmake: Allow non-bundle apps and libs to have an Info.plist 2017-09-29 10:08:08 +00:00
dbus Use QSharedPointer::create() more 2017-07-19 13:40:42 +00:00
gui Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
network Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
opengl tst_QGL::graphicsViewClipping: Wait for viewport's window handle 2017-07-17 14:11:06 +00:00
other Merge remote-tracking branch 'origin/5.9' into dev 2017-08-08 11:48:10 +02:00
printsupport Convert features.completer to QT_[REQUIRE_]CONFIG 2017-09-04 11:28:02 +00:00
shared Remove workaround for potentially unavailable pasteboard in macOS 2017-03-07 01:04:46 +00:00
sql Merge remote-tracking branch 'origin/5.9' into 5.10 2017-09-20 11:58:32 +02:00
testlib Testlib: Format QVector2/3/4D in QCOMPARE 2017-08-27 06:17:32 +00:00
tools Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
widgets Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
xml Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
auto.pro Remove remains of wince in .pro files 2017-07-03 05:32:51 +00:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00