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
..
models.pri	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qsqlquerymodel.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqlquerymodel.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqlquerymodel_p.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqlrelationaldelegate.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqlrelationaldelegate.h	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsqlrelationaltablemodel.cpp	Make it possible to update a related table after an external update	2011-07-29 02:21:08 +02:00
qsqlrelationaltablemodel.h	Fixed behavior on NULL foreign keys	2011-07-20 08:24:59 +02:00
qsqltablemodel.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqltablemodel.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qsqltablemodel_p.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00