AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0aa2d318b1
qt5base-lts/examples/widgets/mainwindows/mainwindow
History
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
..
colorswatch.cpp Add QMainWindow::GroupedDragging DockOption 2015-05-12 10:07:20 +00:00
colorswatch.h Add QMainWindow::GroupedDragging DockOption 2015-05-12 10:07:20 +00:00
main.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
mainwindow.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
mainwindow.h Update copyright headers 2015-02-11 06:49:51 +00:00
mainwindow.pro clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
mainwindow.qrc Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
qt.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
titlebarCenter.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
titlebarLeft.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
titlebarRight.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
toolbar.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
toolbar.h Update copyright headers 2015-02-11 06:49:51 +00:00