AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
04d0a9626c
qt5base-lts/tools/uilib
History
Gunnar Sletta 04d0a9626c Merge branch 'master' into refactor 
Conflicts:
	src/gui/kernel/qapplication_qpa.cpp
	src/gui/kernel/qcursor_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.h
	src/gui/kernel/qwindowsysteminterface_qpa_p.h
	src/gui/text/qtextcontrol.cpp
	src/plugins/platforms/wayland/wayland.pro
	src/widgets/accessible/qaccessible2.h
	src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
2011-08-25 12:48:52 +02:00
..
abstractformbuilder.cpp Merge branch 'master' into refactor 2011-08-25 12:48:52 +02:00
abstractformbuilder.h Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
container.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
container.qdoc Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
customwidget.h Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
customwidget.qdoc Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
extension.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
formbuilder.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
formbuilder.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
formbuilderextra_p.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
formbuilderextra.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
formscriptrunner_p.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
formscriptrunner.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
properties_p.h Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
properties.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
qdesignerexportwidget.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
resourcebuilder_p.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
resourcebuilder.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
textbuilder_p.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
textbuilder.cpp Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
ui4_p.h Submit ui4.cpp/h as generated by corresponding change in qttools. 2011-08-12 13:12:46 +02:00
ui4.cpp Submit ui4.cpp/h as generated by corresponding change in qttools. 2011-08-12 13:12:46 +02:00
uilib_global.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
uilib.pri Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
widgets.table Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00