qt5base-lts/examples/sql/books
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
images Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
bookdelegate.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
bookdelegate.h Update copyright headers 2015-02-11 06:49:51 +00:00
books.pro Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
books.qrc Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
bookwindow.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
bookwindow.h Update copyright headers 2015-02-11 06:49:51 +00:00
bookwindow.ui Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
initdb.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