[SCM] gammaray packaging branch, master, updated. debian/2.0.2-1-10-g397d658

Jakub Adam xhaakon-guest at moszumanska.debian.org
Sun Jul 6 08:06:18 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=98299ba

The following commit has been merged in the master branch:
commit 98299ba6addc56c448e1e7a06a243cb9ece66f55
Merge: ff4bb9dd55c372c1aecc781303a67306c09b0839 c8ac554eb8ba5c17c56792d6b6ad86f9bb14cdac
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jun 29 08:05:47 2014 +0200

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 .krazy                                             |   2 +-
 3rdparty/qt/resourcemodel.cpp                      |   6 +-
 CHANGES                                            |  18 +
 CMakeLists.txt                                     | 658 +++++++++------------
 GammaRay.appdata.xml                               |  40 ++
 Install.txt                                        |   9 +-
 ReadMe.txt                                         |   6 +-
 add_license_blurb.sh                               |   6 +-
 client/clientconnectionmanager.cpp                 |   1 +
 client/propertycontrollerclient.cpp                |  12 +-
 client/propertycontrollerclient.h                  |   4 -
 client/remotemodel.cpp                             |  51 +-
 client/remotemodel.h                               |  20 +-
 cmake/ECMQt4To5Porting.cmake                       |   4 +-
 cmake/GammaRayMacrosInternal.cmake                 |  17 +-
 cmake/GammaRayProbeABI.cmake                       |  11 +-
 cmake/MacroLogFeature.cmake                        | 157 -----
 cmake/Toolchain-GCC-i686.cmake                     |  14 +
 common/CMakeLists.txt                              |  28 +-
 common/endpoint.h                                  |   3 +-
 common/methodargument.cpp                          |  21 +-
 common/modelroles.h                                |   3 +-
 common/objectbroker.h                              |   8 +-
 common/probeabi.cpp                                | 248 ++++++++
 common/probeabi.h                                  |  92 +++
 common/probeabidetector.cpp                        | 134 +++++
 common/probeabidetector.h                          |  73 +++
 .../probeabidetector_dummy.cpp                     |  38 +-
 common/probeabidetector_elf.cpp                    | 199 +++++++
 common/probeabidetector_mac.cpp                    | 147 +++++
 common/probeabidetector_win.cpp                    | 203 +++++++
 common/propertycontrollerinterface.h               |   7 +-
 common/{objectmodel.h => propertymodel.h}          |  43 +-
 common/protocol.cpp                                |   2 +-
 common/sharedmemorylocker.h                        |   5 +
 common/streamoperators.cpp                         |   3 +
 .../connectionsextensioninterface.cpp              |  33 +-
 .../connectionsextensioninterface.h                |  36 +-
 .../tools/objectinspector/connectionsmodelroles.h  |  41 +-
 .../objectinspector/methodsextensioninterface.cpp} |  12 +-
 .../objectinspector/methodsextensioninterface.h}   |  27 +-
 .../propertiesextensioninterface.cpp}              |  10 +-
 .../propertiesextensioninterface.h}                |  28 +-
 .../propertytest.cpp => common/variantwrapper.h    |  66 +--
 config-gammaray.h.cmake                            |   3 +
 core/CMakeLists.txt                                |  23 +-
 core/aggregatedpropertymodel.cpp                   | 149 +++++
 .../aggregatedpropertymodel.h                      |  52 +-
 core/metaobject.cpp                                |  18 +
 core/metaobject.h                                  |   3 +
 core/metaobjectrepository.cpp                      |   8 +-
 core/metaobjectrepository.h                        |   2 +-
 core/metapropertymodel.cpp                         |  36 +-
 core/metapropertymodel.h                           |   1 +
 core/multisignalmapper.cpp                         |   2 +-
 core/objectdynamicpropertymodel.cpp                |  38 +-
 core/objectdynamicpropertymodel.h                  |   1 -
 core/objectmodelbase.h                             |   4 +-
 core/objectpropertymodel.cpp                       |  31 +-
 core/objectpropertymodel.h                         |   7 +-
 core/objectstaticpropertymodel.cpp                 | 112 +++-
 core/objectstaticpropertymodel.h                   |  11 +-
 core/probe.cpp                                     |  18 +
 core/probe.h                                       |   4 +
 core/probeinterface.h                              |   7 +
 core/probesettings.cpp                             |   2 +
 core/propertycontroller.cpp                        | 184 ++----
 core/propertycontroller.h                          |  45 +-
 .../propertycontrollerextension.cpp                |  50 +-
 core/propertycontrollerextension.h                 | 103 ++++
 core/proxytoolfactory.cpp                          |   6 +
 core/proxytoolfactory.h                            |   2 +
 core/toolfactory.h                                 |  18 +
 core/toolmodel.cpp                                 |  78 ++-
 core/toolmodel.h                                   |   6 +
 core/tools/localeinspector/localeaccessormodel.h   |   3 +-
 core/tools/messagehandler/messagehandler.cpp       |   4 +-
 .../messagehandler/messagehandlerinterface.cpp     |   3 +-
 .../tools/messagehandler/messagehandlerinterface.h |   7 +-
 core/tools/metatypebrowser/metatypebrowser.cpp     |   3 +-
 core/tools/metatypebrowser/metatypebrowser.h       |   4 +-
 core/tools/mimetypes/mimetypes.h                   |  10 +-
 core/tools/mimetypes/mimetypesmodel.h              |  51 +-
 core/tools/modelinspector/modelcellmodel.cpp       |   4 +-
 core/tools/modelinspector/modelinspector.cpp       |   8 +-
 core/tools/modelinspector/modelinspector.h         |   2 +-
 .../objectinspector/abstractconnectionsmodel.cpp   | 208 +++++++
 .../objectinspector/abstractconnectionsmodel.h     |  73 +++
 core/tools/objectinspector/classinfoextension.cpp  |  54 ++
 .../tools/objectinspector/classinfoextension.h     |  40 +-
 .../tools/objectinspector/connectionsextension.cpp |  91 +++
 core/tools/objectinspector/connectionsextension.h  |  67 +++
 .../tools/objectinspector/enumsextension.cpp       |  49 +-
 .../tools/objectinspector/enumsextension.h         |  40 +-
 .../objectinspector/inboundconnectionsmodel.cpp    | 135 +++++
 .../inboundconnectionsmodel.h}                     |  29 +-
 core/tools/objectinspector/methodsextension.cpp    | 155 +++++
 core/tools/objectinspector/methodsextension.h      |  70 +++
 core/tools/objectinspector/objectinspector.cpp     |  20 +-
 core/tools/objectinspector/objectinspector.h       |   2 +
 .../objectinspector/outboundconnectionsmodel.cpp   | 118 ++++
 .../outboundconnectionsmodel.h}                    |  30 +-
 core/tools/objectinspector/propertiesextension.cpp | 101 ++++
 core/tools/objectinspector/propertiesextension.h   |  68 +++
 core/tools/resourcebrowser/resourcebrowser.cpp     |  10 +-
 core/tools/standardpaths/standardpaths.h           |   6 +-
 core/tools/standardpaths/standardpathsmodel.h      |   4 +-
 .../textdocumentformatmodel.cpp                    |   3 +-
 .../textdocumentinspector.cpp                      |   2 +-
 .../textdocumentinspector/textdocumentmodel.h      |   3 +-
 core/varianthandler.cpp                            |  25 +
 debian.changelog                                   |  12 +
 docs/CMakeLists.txt                                |  57 ++
 Doxyfile.cmake => docs/Doxyfile.cmake              |   0
 docs/Mainpage.dox                                  |   7 +-
 docs/footer.html                                   |   2 +-
 gammaray.pod => docs/gammaray.pod                  |   0
 gammaray.dsc                                       |   4 +-
 gammaray.spec                                      |  14 +-
 hooking/CMakeLists.txt                             |  19 +-
 .../keyhandlingtest.qml => hooking/entry_unix.cpp  |  29 +-
 .../keyhandlingtest.qml => hooking/entry_win.cpp   |  48 +-
 hooking/functionoverwriterfactory.cpp              |   4 +
 hooking/hooks.cpp                                  | 150 ++---
 hooking/hooks.h                                    |  67 +++
 hooking/preload.cpp                                |  84 +++
 hooking/winfunctionoverwriter.cpp                  |   4 -
 hooking/winfunctionoverwriter.h                    |   4 -
 launcher/CMakeLists.txt                            |   2 +-
 launcher/launchoptions.cpp                         |  30 +-
 launcher/launchoptions.h                           |  12 +-
 launcher/main.cpp                                  |  46 +-
 launcher/probefinder.cpp                           |  37 +-
 launcher/probefinder.h                             |  17 +-
 launcher/ui/CMakeLists.txt                         |   1 +
 launcher/ui/attachdialog.cpp                       |  25 +-
 launcher/ui/attachdialog.h                         |   3 +
 launcher/ui/launchpage.cpp                         |  25 +-
 launcher/ui/launchpage.h                           |   8 +
 launcher/ui/probeabimodel.cpp                      |  68 +++
 .../ui/probeabimodel.h                             |  37 +-
 launcher/ui/processfiltermodel.cpp                 |   2 +-
 launcher/ui/processlist.h                          |  15 +-
 launcher/ui/processlist_unix.cpp                   |  66 +--
 launcher/ui/processlist_win.cpp                    |  46 +-
 launcher/ui/processmodel.cpp                       |  28 +-
 launcher/ui/processmodel.h                         |   8 +-
 launcher/ui/selftestpage.cpp                       |  10 +-
 plugins/CMakeLists.txt                             |   5 +-
 plugins/codecbrowser/codecbrowserwidget.h          |   4 +-
 plugins/fontbrowser/fontbrowserclient.h            |   4 +-
 plugins/fontbrowser/fontbrowserinterface.h         |   4 +-
 plugins/fontbrowser/fontbrowserserver.h            |   4 +-
 plugins/kjobtracker/CMakeLists.txt                 |  48 +-
 plugins/kjobtracker/kjobmodel.cpp                  |  10 +-
 plugins/kjobtracker/kjobmodel.h                    |   4 +-
 plugins/kjobtracker/kjobtracker.cpp                |   2 +
 plugins/kjobtracker/kjobtracker.h                  |   5 +-
 plugins/kjobtracker/kjobtrackerwidget.h            |   4 +-
 plugins/objectvisualizer/objectvisualizermodel.h   |   4 +-
 plugins/objectvisualizer/vtkwidget.cpp             |   3 +-
 plugins/qmlsupport/CMakeLists.txt                  |   3 +
 plugins/qmlsupport/gammaray_qmlsupport.desktop     |   6 +
 plugins/qmlsupport/qmlsupport.cpp                  |  80 +++
 .../qmlsupport/qmlsupport.h                        |  38 +-
 plugins/quickinspector/CMakeLists.txt              |  83 +++
 plugins/quickinspector/annotatedscenepreview.cpp   | 308 ++++++++++
 plugins/quickinspector/annotatedscenepreview.h     |  93 +++
 .../quickinspector/gammaray_quickinspector.desktop |   5 +
 .../gammaray_quickinspector_ui.desktop}            |   4 +-
 .../geometryextension/sggeometryextension.cpp      |  61 ++
 .../geometryextension/sggeometryextension.h        |  46 +-
 .../sggeometryextensionclient.cpp}                 |  17 +-
 .../geometryextension/sggeometryextensionclient.h} |  24 +-
 .../sggeometryextensioninterface.cpp               |  18 +-
 .../sggeometryextensioninterface.h                 |  31 +-
 .../geometryextension/sggeometrymodel.cpp          | 232 ++++++++
 .../geometryextension/sggeometrymodel.h}           |  68 ++-
 .../geometryextension/sggeometrytab.cpp            |  69 +++
 .../geometryextension/sggeometrytab.h              |  30 +-
 .../geometryextension/sggeometrytab.ui             |  68 +++
 .../geometryextension/sgwireframewidget.cpp        | 374 ++++++++++++
 .../geometryextension/sgwireframewidget.h          |  87 +++
 .../materialextension/materialextension.cpp        |  88 +++
 .../materialextension/materialextension.h          |  46 +-
 .../materialextension/materialextensionclient.cpp  |  21 +-
 .../materialextension/materialextensionclient.h    |  26 +-
 .../materialextensioninterface.cpp                 |  18 +-
 .../materialextension/materialextensioninterface.h |  35 +-
 .../materialextension/materialtab.cpp              |  79 +++
 .../quickinspector/materialextension/materialtab.h |  50 +-
 .../materialextension/materialtab.ui               |  35 ++
 plugins/quickinspector/quickclientitemmodel.cpp    | 112 ++++
 .../quickinspector/quickclientitemmodel.h          |  33 +-
 plugins/quickinspector/quickinspector.cpp          | 631 ++++++++++++++++++++
 plugins/quickinspector/quickinspector.h            | 135 +++++
 plugins/quickinspector/quickinspectorclient.cpp    | 101 ++++
 plugins/quickinspector/quickinspectorclient.h      |  61 ++
 plugins/quickinspector/quickinspectorinterface.cpp |  68 +++
 plugins/quickinspector/quickinspectorinterface.h   |  96 +++
 plugins/quickinspector/quickinspectorwidget.cpp    | 281 +++++++++
 plugins/quickinspector/quickinspectorwidget.h      |  87 +++
 plugins/quickinspector/quickinspectorwidget.ui     | 127 ++++
 plugins/quickinspector/quickitemdelegate.cpp       | 136 +++++
 .../quickinspector/quickitemdelegate.h             |  42 +-
 plugins/quickinspector/quickitemmodel.cpp          | 396 +++++++++++++
 plugins/quickinspector/quickitemmodel.h            | 116 ++++
 .../quickinspector/quickitemmodelroles.h           |  41 +-
 plugins/quickinspector/quickitemtreewatcher.cpp    |  72 +++
 .../quickinspector/quickitemtreewatcher.h          |  41 +-
 plugins/quickinspector/quickscenegraphmodel.cpp    | 293 +++++++++
 plugins/quickinspector/quickscenegraphmodel.h      |  85 +++
 plugins/quickinspector/resources/active-focus.png  | Bin 0 -> 761 bytes
 plugins/quickinspector/resources/active-focus.svg  | 558 +++++++++++++++++
 plugins/quickinspector/resources/focus.png         | Bin 0 -> 726 bytes
 plugins/quickinspector/resources/focus.svg         | 562 ++++++++++++++++++
 .../quickinspector/resources/measure-pixels.png    | Bin 0 -> 372 bytes
 plugins/quickinspector/resources/move-preview.png  | Bin 0 -> 467 bytes
 .../quickinspector/resources/quickinspector.qrc    |  15 +
 plugins/quickinspector/resources/quickpreview.qml  | 529 +++++++++++++++++
 .../quickinspector/resources/redirect-input.png    | Bin 0 -> 468 bytes
 .../quickinspector/resources/visualize-batches.png | Bin 0 -> 685 bytes
 .../quickinspector/resources/visualize-changes.png | Bin 0 -> 599 bytes
 .../resources/visualize-clipping.png               | Bin 0 -> 684 bytes
 .../resources/visualize-overdraw.png               | Bin 0 -> 728 bytes
 plugins/quickinspector/resources/warning.png       | Bin 0 -> 557 bytes
 plugins/sceneinspector/sceneinspectorclient.h      |   4 +-
 plugins/sceneinspector/sceneinspectorinterface.h   |   4 +-
 .../gammaray_statemachineviewer.desktop            |   2 +-
 plugins/statemachineviewer/gvgraph/gvgraph.h       |   5 +-
 .../statemachineviewer/gvgraph/gvgraphelements.h   |   8 +-
 plugins/statemachineviewer/gvgraph/gvgraphitems.h  |   4 +-
 plugins/statemachineviewer/gvgraph/gvtypes.h       |   4 +-
 plugins/statemachineviewer/gvgraph/gvutils.h       |   4 +-
 .../statemachineviewer/statemachineviewerclient.h  |   4 +-
 .../statemachineviewerinterface.h                  |   4 +-
 .../statemachineviewer/statemachineviewerwidget.h  |   4 +-
 plugins/statemachineviewer/statemodel.cpp          |  16 +-
 plugins/statemachineviewer/statemodel.h            |   2 +-
 plugins/statemachineviewer/transitionmodel.cpp     |   2 +-
 plugins/styleinspector/styleelementproxymodel.h    |   4 +-
 plugins/styleinspector/styleinspectorclient.h      |   4 +-
 plugins/styleinspector/styleinspectorinterface.h   |   4 +-
 plugins/timertop/timerinfo.cpp                     |   6 +-
 plugins/timertop/timertopwidget.h                  |   4 +-
 plugins/webinspector/webinspector.cpp              |   5 +
 plugins/webinspector/webinspector.h                |   1 +
 plugins/webinspector/webviewmodel.h                |   4 +-
 plugins/widgetinspector/paintbuffermodel.h         |   4 +-
 plugins/widgetinspector/paintbufferreplaywidget.h  |   4 +-
 plugins/widgetinspector/paintbufferviewer.h        |   4 +-
 plugins/widgetinspector/widgetinspectorclient.h    |   4 +-
 plugins/widgetinspector/widgetinspectorinterface.h |   4 +-
 plugins/widgetinspector/widgetinspectorserver.h    |   4 +-
 resources/CMakeLists.txt                           |  26 +
 resources/classes/qtquick2/README                  |   1 +
 resources/classes/qtquick2/border-image-icon16.png | Bin 0 -> 426 bytes
 resources/classes/qtquick2/flickable-icon16.png    | Bin 0 -> 378 bytes
 resources/classes/qtquick2/flipable-icon16.png     | Bin 0 -> 466 bytes
 resources/classes/qtquick2/focusscope-icon16.png   | Bin 0 -> 344 bytes
 resources/classes/qtquick2/gridview-icon16.png     | Bin 0 -> 315 bytes
 resources/classes/qtquick2/image-icon16.png        | Bin 0 -> 523 bytes
 resources/classes/qtquick2/item-icon16.png         | Bin 0 -> 312 bytes
 resources/classes/qtquick2/listview-icon16.png     | Bin 0 -> 330 bytes
 resources/classes/qtquick2/mouse-area-icon16.png   | Bin 0 -> 426 bytes
 resources/classes/qtquick2/pathview-icon16.png     | Bin 0 -> 320 bytes
 resources/classes/qtquick2/rect-icon16.png         | Bin 0 -> 253 bytes
 resources/classes/qtquick2/text-edit-icon16.png    | Bin 0 -> 342 bytes
 resources/classes/qtquick2/text-icon16.png         | Bin 0 -> 299 bytes
 resources/classes/qtquick2/text-input-icon16.png   | Bin 0 -> 332 bytes
 resources/classes/qtquick2/webview-icon16.png      | Bin 0 -> 519 bytes
 resources/gammaray.qrc                             |  17 +
 tests/CMakeLists.txt                               |  17 +-
 tests/manual/CMakeLists.txt                        |   3 +
 tests/manual/connectionstest.cpp                   | 105 ++++
 tests/manual/propertytest.cpp                      |   7 +-
 ...lingtest.qml => quickitemcreatedestroytest.qml} |  30 +-
 .../{keyhandlingtest.qml => reparenttest.qml}      |  45 +-
 tests/probeabidetectortest.cpp                     | 102 ++++
 tests/probeabitest.cpp                             | 225 +++++++
 ui/CMakeLists.txt                                  |  51 +-
 ui/clienttoolmodel.cpp                             |  25 +-
 ui/clienttoolmodel.h                               |   5 +
 .../lldbinjector.h => ui/editabletypesmodel.cpp    |  51 +-
 .../webviewmodel.h => ui/editabletypesmodel.h      |  32 +-
 ui/mainwindow.cpp                                  |  33 +-
 ui/propertyeditor/propertyeditordelegate.h         |   3 +-
 ui/propertyeditor/propertyeditorfactory.cpp        |  46 +-
 ui/propertyeditor/propertyeditorfactory.h          |  19 +-
 ui/propertywidget.cpp                              | 266 ++-------
 ui/propertywidget.h                                |  34 +-
 ui/propertywidget.ui                               | 229 -------
 ui/propertywidgettab.h                             |  71 +++
 ui/proxytooluifactory.cpp                          |   9 +
 ui/proxytooluifactory.h                            |   1 +
 ui/tools/objectinspector/classinfotab.cpp          |  54 ++
 .../tools/objectinspector/classinfotab.h           |  41 +-
 ui/tools/objectinspector/classinfotab.ui           |  41 ++
 .../connectionsclientproxymodel.cpp                |  42 +-
 .../objectinspector/connectionsclientproxymodel.h  |  25 +-
 .../objectinspector/connectionsextensionclient.cpp |  41 +-
 .../objectinspector/connectionsextensionclient.h   |  35 +-
 ui/tools/objectinspector/connectionstab.cpp        | 101 ++++
 .../{objectinspectorwidget.h => connectionstab.h}  |  29 +-
 ui/tools/objectinspector/connectionstab.ui         | 101 ++++
 ui/tools/objectinspector/enumstab.cpp              |  56 ++
 .../tools/objectinspector/enumstab.h               |  41 +-
 ui/tools/objectinspector/enumstab.ui               |  35 ++
 .../objectinspector/methodsextensionclient.cpp     |  16 +-
 .../tools/objectinspector/methodsextensionclient.h |  20 +-
 ui/tools/objectinspector/methodstab.cpp            | 114 ++++
 .../methodstab.h}                                  |  35 +-
 ui/tools/objectinspector/methodstab.ui             |  57 ++
 ui/tools/objectinspector/objectinspectorwidget.h   |  36 ++
 .../objectinspector/propertiesextensionclient.cpp  |  23 +-
 .../objectinspector/propertiesextensionclient.h    |  30 +-
 ui/tools/objectinspector/propertiestab.cpp         | 207 +++++++
 .../tools/objectinspector/propertiestab.h          |  53 +-
 ui/tools/objectinspector/propertiestab.ui          |  92 +++
 ui/tooluifactory.h                                 |   7 +
 320 files changed, 13133 insertions(+), 2700 deletions(-)

-- 
gammaray packaging



More information about the pkg-kde-commits mailing list