AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90c425642d
qt5base-lts/tests/auto
History
Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	mkspecs/common/linux-android.conf
	src/gui/opengl/qopengl.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/network/socket/qnativesocketengine_winrt_p.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	sync.profile

Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
2016-11-16 12:35:36 +01:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data BIC data files for QtBase for Qt 5.7 2016-10-03 09:38:59 +00:00
cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
corelib Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
dbus Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
gui Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +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.7' into 5.8 2016-11-01 06:02:55 +01:00
opengl Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
other Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Make self-contained test of condensed font matching and width 2016-10-16 00:11:13 +00:00
sql Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
testlib Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
tools Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
widgets Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
xml Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
auto.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00