AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7533156b68
qt5base-lts/tests/auto
History
Liang Qi 7533156b68 Merge remote-tracking branch 'origin/5.11' into 5.12 
Conflicts:
	src/gui/text/qtextengine.cpp
	tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
	tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h

Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc
2018-08-22 10:35:12 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data Add binary compatibility files for 5.11 for QtBase 2018-06-05 06:00:28 +00:00
cmake Merge dev into 5.12 2018-08-21 02:32:50 +02:00
concurrent Merge remote-tracking branch 'origin/5.11' into dev 2018-02-16 08:54:58 +01:00
corelib Merge remote-tracking branch 'origin/5.11' into 5.12 2018-08-22 10:35:12 +02:00
dbus Fix wrong relative path to qdbus_symbols.cpp 2018-07-24 04:24:31 +00:00
gui Add a method to clear the data to QStandardItemModel 2018-08-17 07:17:12 +00:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
network tst_qdtls: add 'invalidConfiguration' test 2018-08-10 12:18:41 +00:00
opengl tst_QGL: Use qWaitForWindowExposed() 2018-04-11 06:05:46 +00:00
other Merge remote-tracking branch 'origin/5.11' into 5.12 2018-08-22 10:35:12 +02:00
printsupport Merge remote-tracking branch 'origin/5.11' into dev 2018-05-03 14:50:22 +02:00
shared Remove workaround for potentially unavailable pasteboard in macOS 2017-03-07 01:04:46 +00:00
sql prune cargo-culted and obsolete winsock deps from autotests 2018-07-19 13:31:08 +00:00
testlib Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
tools Fix QMetaObject naming of class enum flag 2018-08-11 07:59:15 +00:00
widgets QWidgetWindow: Ensure Qt::WA_Mapped is set on obscured parent widgets 2018-08-21 13:18:07 +00:00
xml Don't indefinitely wait for data if it was able to read some data 2018-01-24 05:54:31 +00:00
auto.pro winrt: Skip network auto tests for now 2018-06-22 05:02:39 +00:00
network-settings.h Rework QNetworkReply tests to use docker-based test servers 2018-07-27 17:40:27 +00:00
testserver.pri Revert "Disable Docker-based test servers on QEMU devices temporarily" 2018-08-15 11:20:00 +00:00