AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc35f71434
qt5base-lts/tests/manual
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
bearerex Remove traces of the Maemo platform 2015-02-04 17:14:35 +00:00
cocoa Cocoa: Fix icon size calculation for system tray. 2014-10-22 23:32:17 +02:00
corelib/tools Update license headers and add new license files 2014-09-24 12:26:19 +02:00
diaglib Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
dialogs Update license headers and add new license files 2014-09-24 12:26:19 +02:00
filetest Update license headers and add new license files 2014-09-24 12:26:19 +02:00
gestures Update license headers and add new license files 2014-09-24 12:26:19 +02:00
highdpi Update license headers and add new license files 2014-09-24 12:26:19 +02:00
inputmethodhints Update license headers and add new license files 2014-09-24 12:26:19 +02:00
keypadnavigation Update license headers and add new license files 2014-09-24 12:26:19 +02:00
lance Make it more obvious that Q_WS_ is dead code, and should perhaps be ported 2015-02-03 11:49:14 +00:00
mkspecs Update manualtests license to say "part of test suite". 2013-05-26 20:54:51 +02:00
network_remote_stresstest Update license headers and add new license files 2014-09-24 12:26:19 +02:00
network_stresstest Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qcursor Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qdesktopservices Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qdesktopwidget Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsitem Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsitemgroup Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicslayout/flicker Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qhttpnetworkconnection Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qimagereader Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qlayout Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qlocale Update manualtests license to say "part of test suite". 2013-05-26 20:54:51 +02:00
qmetatype Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnetworkaccessmanager/qget Fix assorted MSVC warnings in tests. 2015-01-17 12:06:59 +01:00
qnetworkconfiguration Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnetworkconfigurationmanager Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnetworkreply Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
qopenglcontext Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qopengltextureblitter Fix compilation of manual Open GL tests with Dynamic GL. 2015-01-15 15:35:11 +01:00
qopenglwidget/openglwidget Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qopenglwindow/multiwindow Add a multiwindow manual test using QOpenGLWindow 2014-09-18 10:06:18 +02:00
qprintdevice_dump Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qscreen QScreen manual test: use sizeHint; don't override QLineEdit text color 2015-01-09 16:21:04 +01:00
qssloptions Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qsslsocket Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtabletevent Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtbug-8933 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtexteditlist Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtouchevent Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qwidget_zorder Update license headers and add new license files 2014-09-24 12:26:19 +02:00
repaint Update license headers and add new license files 2014-09-24 12:26:19 +02:00
shortcuts Update license headers and add new license files 2014-09-24 12:26:19 +02:00
socketengine Update license headers and add new license files 2014-09-24 12:26:19 +02:00
textrendering Make it more obvious that Q_WS_ is dead code, and should perhaps be ported 2015-02-03 11:49:14 +00:00
touch Add manual test for touch events. 2014-10-30 21:35:44 +01:00
transientwindow transient window manual test: set window type to Dialog 2014-10-20 11:03:30 +02:00
unc Update license headers and add new license files 2014-09-24 12:26:19 +02:00
widgetgrab Update license headers and add new license files 2014-09-24 12:26:19 +02:00
widgets Auto-scroll while selecting entire rows/columns did not work 2014-11-29 15:21:48 +01:00
windowchildgeometry Update license headers and add new license files 2014-09-24 12:26:19 +02:00
windowflags Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
windowgeometry Update license headers and add new license files 2014-09-24 12:26:19 +02:00
windowmodality Update license headers and add new license files 2014-09-24 12:26:19 +02:00
windowtransparency Make transparency test actually test transparency 2015-01-16 12:12:37 +01:00
xcb_gl_integration Make GLX and EGL dynamic dependencies for xcb 2014-12-20 06:09:01 +01:00
xembed-raster Update manualtests license to say "part of test suite". 2013-05-26 20:54:51 +02:00
xembed-widgets Update manualtests license to say "part of test suite". 2013-05-26 20:54:51 +02:00
manual.pro Add manual test for touch events. 2014-10-30 21:35:44 +01:00