AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1fce111809
qt5base-lts/tests/auto/widgets/kernel
History
Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 
Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/io/qnoncontiguousbytedevice_p.h
	src/gui/image/qjpeghandler.cpp
	src/network/access/qhttpthreaddelegate_p.h
	tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
	tests/auto/widgets/widgets/qmenubar/BLACKLIST

Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3
2015-05-08 13:26:44 +02:00
..
qaction Tests: Blacklist tests for ubuntu 14.04 2015-04-01 13:59:04 +00:00
qactiongroup Update copyright headers 2015-02-11 06:49:51 +00:00
qapplication autotests: fix the build in case of QT_NO_WHEELEVENT 2015-03-03 13:30:39 +00:00
qboxlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qdesktopwidget Update copyright headers 2015-02-11 06:49:51 +00:00
qformlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qgridlayout Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
qlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qshortcut Update copyright headers 2015-02-11 06:49:51 +00:00
qsizepolicy QtWidgets: assorted migrations to QString::asprintf 2015-02-12 19:39:49 +00:00
qstackedlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qtooltip Update copyright headers 2015-02-11 06:49:51 +00:00
qwidget Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
qwidget_window Update copyright headers 2015-02-11 06:49:51 +00:00
qwidgetaction Update copyright headers 2015-02-11 06:49:51 +00:00
qwidgetmetatype Update copyright headers 2015-02-11 06:49:51 +00:00
qwidgetsvariant Update copyright headers 2015-02-11 06:49:51 +00:00
qwindowcontainer Update copyright headers 2015-02-11 06:49:51 +00:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00