AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ce2419af89
qt5base-lts/tests/manual
History
Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
..
bearerex Updated license headers 2016-01-21 18:55:18 +00:00
cocoa Updated license headers 2016-01-21 18:55:18 +00:00
corelib/tools Updated license headers 2016-01-21 18:55:18 +00:00
diaglib Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
dialogs Updated license headers 2016-01-21 18:55:18 +00:00
embeddedintoforeignwindow Add manual test embeddedintoforeignwindow 2016-07-26 14:53:09 +00:00
filetest Updated license headers 2016-01-21 18:55:18 +00:00
foreignwindows Add a manual test for foreign windows. 2016-03-11 16:03:34 +00:00
gestures Updated license headers 2016-01-21 18:55:18 +00:00
highdpi Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
inputmethodhints Updated license headers 2016-01-21 18:55:18 +00:00
keypadnavigation Updated license headers 2016-01-21 18:55:18 +00:00
lance Updated license headers 2016-01-21 18:55:18 +00:00
mkspecs Updated license headers 2016-01-21 18:55:18 +00:00
network_remote_stresstest Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
network_stresstest Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qcursor Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qdesktopservices Updated license headers 2016-01-21 18:55:18 +00:00
qdesktopwidget Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsitem Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicsitemgroup Updated license headers 2016-01-21 18:55:18 +00:00
qgraphicslayout/flicker Updated license headers 2016-01-21 18:55:18 +00:00
qhttpnetworkconnection Updated license headers 2016-01-21 18:55:18 +00:00
qimagereader Updated license headers 2016-01-21 18:55:18 +00:00
qlayout Updated license headers 2016-01-21 18:55:18 +00:00
qlocale Unify license header usage. 2016-03-29 10:20:03 +00:00
qmetatype Updated license headers 2016-01-21 18:55:18 +00:00
qmimedatabase Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkaccessmanager/qget Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkconfiguration Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkconfigurationmanager Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkreply Updated license headers 2016-01-21 18:55:18 +00:00
qopenglcontext Make QOpenGLTextureBlitter public 2016-07-29 07:21:10 +00:00
qopengltextureblitter Make QOpenGLTextureBlitter public 2016-07-29 07:21:10 +00:00
qopenglwidget/openglwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qopenglwindow/multiwindow Updated license headers 2016-01-21 18:55:18 +00:00
qprintdevice_dump Updated license headers 2016-01-21 18:55:18 +00:00
qscreen Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qssloptions Updated license headers 2016-01-21 18:55:18 +00:00
qsslsocket Updated license headers 2016-01-21 18:55:18 +00:00
qstorageinfo Print the QStorageInfo dump on test start 2016-05-14 01:21:27 +00:00
qsysinfo Remove all code paths related to unsupported Apple platforms. 2016-06-04 09:24:33 +00:00
qt_poll Updated license headers 2016-01-21 18:55:18 +00:00
qtabletevent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
qtbug-8933 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qtbug-52641 QPdf: Force miter limit into valid range 2016-04-28 20:10:17 +00:00
qtexteditlist Updated license headers 2016-01-21 18:55:18 +00:00
qtouchevent Updated license headers 2016-01-21 18:55:18 +00:00
qwidget_zorder Updated license headers 2016-01-21 18:55:18 +00:00
repaint Updated license headers 2016-01-21 18:55:18 +00:00
shortcuts Add manual test for shortcut using implicit AltGr 2016-05-30 15:30:57 +00:00
socketengine Updated license headers 2016-01-21 18:55:18 +00:00
textrendering Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
touch Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
transientwindow Updated license headers 2016-01-21 18:55:18 +00:00
unc Updated license headers 2016-01-21 18:55:18 +00:00
widgetgrab Updated license headers 2016-01-21 18:55:18 +00:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
windowchildgeometry Updated license headers 2016-01-21 18:55:18 +00:00
windowflags Updated license headers 2016-01-21 18:55:18 +00:00
windowgeometry Updated license headers 2016-01-21 18:55:18 +00:00
windowmodality Updated license headers 2016-01-21 18:55:18 +00:00
windowtransparency Unify license header usage. 2016-03-29 10:20:03 +00:00
xcb_gl_integration Updated license headers 2016-01-21 18:55:18 +00:00
xembed-raster Unify license header usage. 2016-03-29 10:20:03 +00:00
xembed-widgets Unify license header usage. 2016-03-29 10:20:03 +00:00
manual.pro Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00