AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
134cad32d7
qt5base-lts/examples/widgets/tools
History
Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
2016-01-26 16:27:28 +01:00
..
codecs Doc: Added brief statement for examples overview page 2016-01-26 09:32:49 +00:00
completer Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
customcompleter Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
echoplugin Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
i18n Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
plugandpaint Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
plugandpaintplugins Use C++ <cmath> instead of <math.h> 2015-02-16 16:21:15 +00:00
regexp Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
regularexpression Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
settingseditor Examples/Doc snippets: Fix single-character string literals. 2015-10-13 16:37:07 +00:00
styleplugin Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
treemodelcompleter Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
undo Updated license headers 2016-01-21 18:55:32 +00:00
undoframework Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
tools.pro Fix building with QT_NO_LIBRARY 2015-09-30 13:04:26 +00:00