Gunnar Sletta a9ac6da893 Merge branch 'master' into refactor ... Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe		2011-09-12 07:49:03 +02:00
..
images	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qstylesheetstyle.pro	Tests: Compile.	2011-05-23 16:49:06 +02:00
resources.qrc	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
tst_qstylesheetstyle.cpp	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00