[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-52-g13c0bc4
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Tue Nov 1 13:25:03 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=aaabc90
The following commit has been merged in the master branch:
commit aaabc90aff40c8127bfe820c01cada4601c995cc
Merge: be67743bb6f408be6d756448670c3d4b2383c91a 5156e84fa4b16034c0c14ea54892093b371f7851
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Tue Nov 1 12:11:32 2016 +0100
Merge tag 'upstream/2.6.0'
.krazy | 2 +-
3rdparty/kde/CMakeLists.txt | 3 +
3rdparty/qt/resourcemodel.cpp | 2 +-
CHANGES | 34 +
CMakeLists.txt | 26 +-
GammaRay.appdata.xml | 39 +-
Install.txt | 6 +-
ReadMe-commercial.txt | 2 +-
ReadMe.txt | 4 +-
client/CMakeLists.txt | 4 +
client/client.cpp | 14 +-
client/clientconnectionmanager.cpp | 28 +-
client/clientconnectionmanager.h | 2 -
client/messagestatisticsmodel.cpp | 4 +-
client/probecontrollerclient.cpp | 12 -
client/probecontrollerclient.h | 3 -
client/remotemodel.cpp | 51 +-
client/remoteviewclient.cpp | 9 +-
client/remoteviewclient.h | 3 +-
...econtrollerclient.cpp => toolmanagerclient.cpp} | 25 +-
.../toolmanagerclient.h | 25 +-
cmake/ECMFindModuleHelpers.cmake | 297 +++++
...lchain-OSX-GCC-i686.cmake => FindQmlLint.cmake} | 31 +-
cmake/FindWayland.cmake | 143 ++
cmake/GammaRayMacros.cmake | 3 +
cmake/Toolchain-Linux-GCC-i686.cmake | 4 +-
cmake/Toolchain-OSX-GCC-i686.cmake | 4 +-
common/CMakeLists.txt | 14 +-
common/endpoint.cpp | 6 +-
common/message.h | 49 +-
common/metatypedeclarations.h | 1 +
common/modelroles.h | 9 -
common/networkselectionmodel.cpp | 18 +-
common/networkselectionmodel.h | 3 +
common/{probecontrollerinterface.h => objectid.h} | 96 +-
.../objectidfilterproxymodel.cpp | 50 +-
common/objectidfilterproxymodel.h | 83 ++
common/paths.cpp | 42 +-
common/paths.h | 19 +-
common/pluginmanager.cpp | 4 +-
common/probecontrollerinterface.cpp | 6 -
common/probecontrollerinterface.h | 115 +-
common/propertysyncer.cpp | 16 +-
common/protocol.cpp | 2 +-
.../qmetaobjectvalidatorresult.h | 45 +-
common/remoteviewinterface.cpp | 9 +-
common/remoteviewinterface.h | 14 +-
.../guisupport.h => common/selflocator.cpp | 60 +-
.../selflocator.h | 26 +-
common/streamoperators.cpp | 20 +
...ectorinterface.cpp => toolmanagerinterface.cpp} | 18 +-
common/toolmanagerinterface.h | 98 ++
.../tools/metaobjectbrowser/qmetaobjectmodel.h | 42 +-
.../metatypebrowser/metatypebrowserinterface.cpp} | 16 +-
.../metatypebrowser/metatypebrowserinterface.h | 35 +-
.../tools/metatypebrowser/metatyperoles.h | 26 +-
.../tools/objectinspector/methodmodel.h | 40 +-
common/translator.cpp | 14 +-
common/translator.h | 8 +-
config-gammaray.h.cmake | 1 +
core/CMakeLists.txt | 14 +-
core/aggregatedpropertymodel.cpp | 41 +-
core/aggregatedpropertymodel.h | 1 +
core/attributemodel.h | 1 +
core/metaobjectmodel.h | 6 +-
core/metaobjectrepository.cpp | 8 +
core/metaobjectrepository.h | 7 +
core/metaobjecttreemodel.cpp | 55 +-
core/metaobjecttreemodel.h | 17 -
core/metapropertyadaptor.cpp | 3 +-
core/objectinstance.cpp | 42 +-
core/objectinstance.h | 11 +-
core/objectmethodmodel.cpp | 82 +-
core/objectmethodmodel.h | 2 -
core/objectmodelbase.h | 4 +-
core/objecttreemodel.cpp | 2 -
core/objecttypefilterproxymodel.cpp | 5 +
core/objecttypefilterproxymodel.h | 2 +
core/probe.cpp | 94 +-
core/probe.h | 8 +-
core/probecontroller.cpp | 53 -
core/probecontroller.h | 3 -
core/probesettings.cpp | 12 +-
core/propertyadaptor.cpp | 2 +
core/propertyadaptorfactory.cpp | 2 +-
core/propertycontroller.cpp | 10 +
core/propertycontroller.h | 9 +-
core/qmetaobjectvalidator.cpp | 97 ++
.../guisupport.h => core/qmetaobjectvalidator.h | 41 +-
core/qmetapropertyadaptor.cpp | 9 +-
core/remote/remotemodelserver.cpp | 34 +-
core/remote/server.cpp | 14 +-
core/remoteviewserver.cpp | 11 +-
core/remoteviewserver.h | 8 +-
core/{toolmodel.cpp => toolmanager.cpp} | 224 ++--
core/{toolmodel.h => toolmanager.h} | 67 +-
core/tools/metaobjectbrowser/metaobjectbrowser.cpp | 15 +-
core/tools/metatypebrowser/metatypebrowser.cpp | 16 +-
core/tools/metatypebrowser/metatypebrowser.h | 16 +-
core/tools/metatypebrowser/metatypesmodel.cpp | 148 ++-
core/tools/metatypebrowser/metatypesmodel.h | 5 +-
core/tools/modelinspector/modelinspector.cpp | 167 ---
core/tools/objectinspector/methodsextension.cpp | 1 +
core/tools/resourcebrowser/resourcebrowser.cpp | 5 +-
core/util.cpp | 47 +-
core/util.h | 17 +-
core/varianthandler.cpp | 21 +
core/varianthandler.h | 4 +
debian.changelog | 6 +
debian.control | 3 +-
docs/CMakeLists.txt | 4 +-
docs/api/Mainpage.dox | 6 +-
docs/api/footer.html | 4 +-
docs/collection/about.txt | 2 +-
docs/manual/CMakeLists.txt | 35 +-
docs/manual/examples/qt3d-geometry.qdoc | 71 +
docs/manual/examples/quick-batching.qdoc | 100 ++
docs/manual/examples/quick-event-handling.qdoc | 60 +
docs/manual/examples/signal-slot.qdoc | 64 +
docs/manual/examples/state-machine.qdoc | 45 +
docs/manual/examples/widget-layouting.qdoc | 65 +
docs/manual/gammaray-action-inspector.qdoc | 2 +-
docs/manual/gammaray-codec-browser.qdoc | 37 +
...-signal-plotter.qdoc => gammaray-examples.qdoc} | 21 +-
docs/manual/gammaray-manual.qdoc | 5 +
docs/manual/gammaray-manual.qdocconf.in | 7 +-
docs/manual/gammaray-messages.qdoc | 7 +
docs/manual/gammaray-mime-types.qdoc | 1 +
docs/manual/gammaray-model-inspector.qdoc | 63 +
...y-signal-plotter.qdoc => gammaray-network.qdoc} | 27 +-
docs/manual/gammaray-objectinspector.qdoc | 9 +-
docs/manual/gammaray-qresource-browser.qdoc | 2 +-
docs/manual/gammaray-qtquick2-inspector.qdoc | 7 +
docs/manual/gammaray-signal-plotter.qdoc | 9 +-
docs/manual/gammaray-state-machine-debugger.qdoc | 7 +
docs/manual/gammaray-timertop.qdoc | 47 +
docs/manual/gammaray-tools.qdoc | 8 +-
docs/manual/gammaray-widget-inspector.qdoc | 8 +
docs/manual/images/gammaray-codec-browser.png | Bin 0 -> 104038 bytes
docs/manual/images/gammaray-model-inspector.png | Bin 0 -> 117527 bytes
docs/manual/images/gammaray-network-interfaces.png | Bin 0 -> 73325 bytes
docs/manual/images/gammaray-timertop.png | Bin 0 -> 39756 bytes
examples/CMakeLists.txt | 14 +
examples/qt3d-geometry/CMakeLists.txt | 5 +
examples/qt3d-geometry/mycylinder.cpp | 246 ++++
.../qt3d-geometry/mycylinder.h | 24 +-
examples/qt3d-geometry/qt3d-geometry.cpp | 93 ++
examples/qt3d-geometry/qt3d-geometry.pro | 3 +
examples/quick-batching/CMakeLists.txt | 1 +
examples/quick-batching/Slider.qml | 108 ++
examples/quick-batching/quick-batching.pro | 2 +
.../quick-batching/quick-batching.qml | 60 +-
examples/quick-event-handling/CMakeLists.txt | 1 +
.../quick-event-handling/quick-event-handling.pro | 2 +
.../quick-event-handling/quick-event-handling.qml | 57 +-
examples/signal-slot/CMakeLists.txt | 2 +
examples/signal-slot/signal-slot.cpp | 84 ++
examples/signal-slot/signal-slot.pro | 2 +
examples/state-machine/CMakeLists.txt | 1 +
examples/state-machine/state-machine.pro | 2 +
examples/state-machine/state-machine.qml | 177 +++
examples/widget-layouting/CMakeLists.txt | 9 +
examples/widget-layouting/contactform.ui | 585 +++++++++
.../widget-layouting/widget-layouting.cpp | 38 +-
examples/widget-layouting/widget-layouting.pro | 3 +
gammaray-qt4-debian.control | 2 +-
gammaray-qt4.dsc | 6 +-
gammaray-qt4.spec | 24 +-
gammaray.dsc | 6 +-
gammaray.spec | 33 +-
inprocessui/CMakeLists.txt | 3 +
launcher/CMakeLists.txt | 6 +
launcher/injector/CMakeLists.txt | 3 +
launcher/injector/abstractinjector.cpp | 10 +
launcher/injector/abstractinjector.h | 8 +
launcher/injector/styleinjector.cpp | 18 +-
launcher/launcher.cpp | 7 +-
launcher/main.cpp | 2 -
launcher/probeabidetector_elf.cpp | 24 +-
launcher/ui/launcherwindow.cpp | 1 +
launcher/ui/launcherwindow.ui | 2 +-
launcher/ui/promolabel.cpp | 2 +-
plugins/CMakeLists.txt | 4 +-
plugins/actioninspector/CMakeLists.txt | 5 +
plugins/actioninspector/actioninspector.cpp | 21 +-
plugins/actioninspector/actioninspectorwidget.cpp | 85 +-
plugins/actioninspector/actioninspectorwidget.h | 9 +
.../actioninspector/actioninspectorwidget.ui | 14 +-
plugins/actioninspector/actionmodel.cpp | 102 +-
plugins/actioninspector/actionmodel.h | 15 +-
plugins/actioninspector/clientactionmodel.cpp | 87 ++
.../actioninspector/clientactionmodel.h | 23 +-
plugins/codecbrowser/codecmodel.cpp | 4 +-
plugins/fontbrowser/fontmodel.cpp | 1 +
plugins/guisupport/guisupport.cpp | 21 +-
plugins/guisupport/guisupport.h | 12 +
plugins/kjobtracker/CMakeLists.txt | 4 +-
plugins/mimetypes/CMakeLists.txt | 19 +
plugins/mimetypes/gammaray_mimetypes.json | 8 +
{core/tools => plugins}/mimetypes/mimetypes.cpp | 0
{core/tools => plugins}/mimetypes/mimetypes.h | 3 +-
.../tools => plugins}/mimetypes/mimetypesmodel.cpp | 0
{core/tools => plugins}/mimetypes/mimetypesmodel.h | 0
.../mimetypes/mimetypeswidget.cpp | 0
{ui/tools => plugins}/mimetypes/mimetypeswidget.h | 9 +
{ui/tools => plugins}/mimetypes/mimetypeswidget.ui | 0
plugins/modelinspector/CMakeLists.txt | 51 +
.../modelinspector/gammaray_modelinspector.desktop | 7 +
.../modelinspector/gammaray_modelinspector.json | 13 +
.../gammaray_modelinspector_ui.desktop} | 4 +-
.../modelinspector/modelcellmodel.cpp | 112 +-
.../modelinspector/modelcellmodel.h | 5 +-
plugins/modelinspector/modelcontentdelegate.cpp | 69 +
.../modelinspector/modelcontentdelegate.h | 28 +-
plugins/modelinspector/modelcontentproxymodel.cpp | 132 ++
.../modelinspector/modelcontentproxymodel.h | 43 +-
plugins/modelinspector/modelinspector.cpp | 199 +++
.../modelinspector/modelinspector.h | 25 +-
.../modelinspector/modelinspectorclient.cpp | 0
.../modelinspector/modelinspectorclient.h | 2 +-
.../modelinspector}/modelinspectorinterface.cpp | 52 +-
.../modelinspector}/modelinspectorinterface.h | 25 +-
.../modelinspector/modelinspectorwidget.cpp | 125 +-
.../modelinspector/modelinspectorwidget.h | 13 +-
plugins/modelinspector/modelinspectorwidget.ui | 192 +++
.../modelinspector/modelmodel.cpp | 30 +-
.../tools => plugins}/modelinspector/modelmodel.h | 3 +-
.../modelinspector/modeltester.cpp | 7 +-
.../tools => plugins}/modelinspector/modeltester.h | 1 +
plugins/modelinspector/selectionmodelmodel.cpp | 200 +++
.../selectionmodelmodel.h} | 58 +-
plugins/positioning/gammaray_positioning.json | 8 +-
plugins/qmlsupport/qmlsupport.cpp | 16 +
plugins/qmlsupport/qmltypeextension.cpp | 11 +
.../geometryextension/qt3dgeometrytab.cpp | 5 +-
.../geometryextension/sggeometrymodel.cpp | 3 -
.../geometryextension/sgwireframewidget.cpp | 2 +-
plugins/quickinspector/quickinspector.cpp | 104 +-
plugins/quickinspector/quickinspector.h | 12 +-
plugins/quickinspector/quickinspectorwidget.cpp | 3 +-
plugins/quickinspector/quickitemmodel.cpp | 2 -
plugins/quickinspector/quickscenegraphmodel.cpp | 1 -
plugins/sceneinspector/scenemodel.cpp | 2 +-
plugins/selectionmodelinspector/CMakeLists.txt | 40 -
.../gammaray_selectionmodelinspector.desktop.in | 6 -
.../gammaray_selectionmodelinspector.json | 5 -
.../selectionmodelinspector.cpp | 76 --
.../selectionmodelinspector.h | 69 -
.../selectionmodelinspectorwidget.cpp | 67 -
.../selectionmodelinspectorwidget.ui | 42 -
.../gammaray_signalmonitor.desktop.in | 1 +
plugins/signalmonitor/gammaray_signalmonitor.json | 3 +
plugins/signalmonitor/signalhistorymodel.cpp | 7 +
plugins/signalmonitor/signalhistorymodel.h | 3 +-
plugins/signalmonitor/signalmonitor.cpp | 19 +
plugins/signalmonitor/signalmonitor.h | 4 +
plugins/signalmonitor/signalmonitorwidget.cpp | 32 +
plugins/signalmonitor/signalmonitorwidget.h | 6 +
plugins/signalmonitor/signalmonitorwidget.ui | 3 +
.../statemachineviewerwidget.cpp | 4 -
.../abstractstyleelementstatetable.cpp | 1 +
plugins/styleinspector/standardiconmodel.cpp | 10 +
plugins/styleinspector/styleinspectorwidget.cpp | 10 +-
.../gammaray_textdocumentinspector.desktop | 1 +
.../gammaray_textdocumentinspector.json | 10 +-
.../textdocumentinspector.cpp | 71 +-
.../textdocumentinspector/textdocumentinspector.h | 7 +
.../textdocumentinspectorwidget.cpp | 24 +-
.../textdocumentinspectorwidget.h | 1 +
.../textdocumentinspectorwidget.ui | 3 +
.../textdocumentinspector/textdocumentmodel.cpp | 3 +-
plugins/timertop/gammaray_timertop.json | 3 +
plugins/timertop/timermodel.cpp | 115 +-
plugins/timertop/timermodel.h | 28 +-
plugins/timertop/timertop.cpp | 66 +-
plugins/timertop/timertop.h | 9 +-
plugins/timertop/timertopwidget.cpp | 26 +-
plugins/timertop/timertopwidget.h | 3 +
plugins/timertop/timertopwidget.ui | 3 +
plugins/translatorinspector/translatorwrapper.cpp | 20 +-
plugins/translatorinspector/translatorwrapper.h | 2 +-
plugins/widgetinspector/CMakeLists.txt | 4 +
plugins/widgetinspector/widgetinspectorserver.cpp | 163 ++-
plugins/widgetinspector/widgetinspectorserver.h | 12 +-
plugins/widgetinspector/widgetinspectorwidget.cpp | 1 +
plugins/wlcompositorinspector/CMakeLists.txt | 46 +
.../gammaray_wlcompositorinspector.json | 5 +
plugins/wlcompositorinspector/inspectorwidget.cpp | 137 ++
.../inspectorwidget.h} | 56 +-
plugins/wlcompositorinspector/inspectorwidget.ui | 42 +
plugins/wlcompositorinspector/logview.cpp | 481 +++++++
.../wlcompositorinspector/logview.h | 36 +-
plugins/wlcompositorinspector/resourceinfo.cpp | 154 +++
.../resourceinfo.h} | 44 +-
.../wlcompositorinspector/ringbuffer.h | 64 +-
.../wlcompositorclient.cpp} | 46 +-
.../wlcompositorinspector/wlcompositorclient.h | 37 +-
.../wlcompositorinspector.cpp | 716 ++++++++++
.../wlcompositorinspector/wlcompositorinspector.h | 95 ++
.../wlcompositorinterface.cpp | 21 +-
.../wlcompositorinterface.h} | 51 +-
probe/CMakeLists.txt | 6 +
resources/GammaRay-Trademark-medium.png | Bin 0 -> 15434 bytes
...mark-small.png => Gammaray-Trademark-small.png} | Bin
resources/gammaray-trademark-medium.png | Bin 12454 -> 0 bytes
resources/gammaray-trademark.png | Bin 35945 -> 0 bytes
resources/gammaray.qrc | 1 +
tests/CMakeLists.txt | 110 ++
tests/actiontest.cpp | 90 +-
tests/enumpropertytest.cpp | 123 ++
tests/metaobjecttreemodeltest.cpp | 123 ++
tests/metatypemodeltest.cpp | 98 ++
tests/methodmodeltest.cpp | 135 ++
tests/modelinspectortest.cpp | 371 ++++++
tests/objectinstancetest.cpp | 3 +
tests/propertymodeltest.cpp | 41 +
tests/qmetaobjectvalidatortest.cpp | 115 ++
tests/qmlsupporttest.cpp | 6 +
tests/quickinspectortest.cpp | 19 +-
tests/remotemodeltest.cpp | 12 +-
.../selflocatortest.cpp | 44 +-
.../selftesttest.cpp | 37 +-
tests/shared/propertytestobject.h | 7 +-
tests/timertoptest.cpp | 157 +++
tests/toolmanagertest.cpp | 223 ++++
tests/translatortest.cpp | 36 +-
tests/widgettest.cpp | 2 +-
translations/gammaray_de.ts | 1367 ++++++++++----------
translations/gammaray_en.ts | 649 ++++++----
ui/CMakeLists.txt | 17 +-
ui/aboutdata.cpp | 2 +-
ui/clienttoolmanager.cpp | 330 +++++
ui/clienttoolmanager.h | 139 ++
ui/clienttoolmodel.cpp | 241 +---
ui/clienttoolmodel.h | 58 +-
ui/contextmenuextension.cpp | 32 +-
ui/contextmenuextension.h | 2 +-
ui/deferredtreeview.cpp | 1 -
ui/helpcontroller.cpp | 16 +-
ui/mainwindow.cpp | 128 +-
ui/mainwindow.h | 3 +
ui/mainwindow.ui | 116 +-
ui/modelpickerdialog.cpp | 128 ++
.../signalmonitor.h => ui/modelpickerdialog.h | 64 +-
ui/palettemodel.cpp | 12 +-
ui/propertywidget.cpp | 13 +
ui/propertywidget.h | 2 +
ui/remoteviewwidget.cpp | 64 +-
ui/remoteviewwidget.h | 9 +
ui/sidepane.cpp | 2 +
.../metaobjecttreeclientproxymodel.cpp | 79 +-
.../metaobjecttreeclientproxymodel.h | 1 +
.../metatypebrowser/metatypebrowserclient.cpp | 24 +-
.../metatypebrowserclient.h} | 28 +-
ui/tools/metatypebrowser/metatypebrowserwidget.cpp | 48 +-
ui/tools/metatypebrowser/metatypebrowserwidget.h | 3 +
ui/tools/metatypebrowser/metatypebrowserwidget.ui | 14 +
ui/tools/metatypebrowser/metatypesclientmodel.cpp | 92 ++
.../tools/metatypebrowser/metatypesclientmodel.h | 30 +-
ui/tools/modelinspector/modelinspectorwidget.ui | 123 --
ui/tools/objectinspector/clientmethodmodel.cpp | 136 ++
.../tools/objectinspector/clientmethodmodel.h | 30 +-
ui/tools/objectinspector/methodstab.cpp | 12 +-
ui/tools/objectinspector/objectinspectorwidget.cpp | 3 -
364 files changed, 12564 insertions(+), 3894 deletions(-)
--
gammaray packaging
More information about the pkg-kde-commits
mailing list