AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29daa7645b
qt5base-lts/tests/auto/widgets/dialogs
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
..
qcolordialog Add test for QColorDialog initial color 2015-01-19 15:41:10 +01:00
qdialog Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qerrormessage Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qfiledialog Enter/Return should cause an edit inside an itemview on OS X 2015-01-23 10:35:14 +01:00
qfiledialog2 Enable tst_qfiledialog2 on OSX 2014-11-19 16:13:25 +01:00
qfilesystemmodel Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qfontdialog QStyleSheetStyle: Don't interfere with QFontDialog 2014-10-24 16:59:26 +02:00
qinputdialog Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmessagebox Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qprogressdialog QProgressDialog: don't require setValue(0) to be called. 2015-01-17 06:32:21 +01:00
qsidebar Android: Fix QSideBar test 2015-01-16 09:27:45 +01:00
qwizard Stabilize tst_qwizard. 2014-10-03 19:07:22 +02:00
dialogs.pro Replace win32-g++ with mingw scope 2014-01-17 12:08:24 +01:00