Samuel Rødal 92c998afb6 Merge remote branch 'gerrit/master' into refactor ... Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736		2011-08-03 11:03:22 +02:00
..
inifiles	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
locationdialog.cpp	Merge remote branch 'gerrit/master' into refactor	2011-08-03 11:03:22 +02:00
locationdialog.h	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
main.cpp	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
mainwindow.cpp	include fixes	2011-05-07 22:57:49 +02:00
mainwindow.h	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
settingseditor.desktop	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
settingseditor.pro	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
settingstree.cpp	include fixes	2011-05-07 22:57:49 +02:00
settingstree.h	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
variantdelegate.cpp	include fixes	2011-05-07 22:57:49 +02:00
variantdelegate.h	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00