Liang Qi 1c8451bdbb Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/tools/qdoc/tree.cpp tests/auto/gui/painting/qcolor/tst_qcolor.cpp Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc		2015-04-27 21:36:32 +02:00
..
cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-27 21:36:32 +02:00
customwidgetsinfo.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
customwidgetsinfo.h	Update copyright headers	2015-02-11 06:49:51 +00:00
databaseinfo.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
databaseinfo.h	Update copyright headers	2015-02-11 06:49:51 +00:00
driver.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
driver.h	Update copyright headers	2015-02-11 06:49:51 +00:00
globaldefs.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
option.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qclass_lib_map.h	uic: Add QOpenGLWidget.	2014-09-29 20:53:26 +02:00
treewalker.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
treewalker.h	Update copyright headers	2015-02-11 06:49:51 +00:00
ui4.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
ui4.h	Update copyright headers	2015-02-11 06:49:51 +00:00
uic.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
uic.h	Remove <qhash.h> where it's not used	2015-04-20 07:41:34 +00:00
uic.pri	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
uic.pro	Remove traces of the Maemo platform	2015-02-04 17:14:35 +00:00
utils.h	Update copyright headers	2015-02-11 06:49:51 +00:00
validator.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
validator.h	Update copyright headers	2015-02-11 06:49:51 +00:00