[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-42-g5743462

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 62d0199a24ffcadf8c9af66d14afdfd1b8b229ee
Merge: d6f1a2870c44094fa86dfdacd7904332b3eda42b b97c131d082770b5fcad6d3c33dfed458cde5da7
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 28 07:34:14 2016 +0200

    Merge tag 'upstream/2.5.1'
    
    Upstream version 2.5.1

 3rdparty/qt/resourcemodel.cpp                      |   2 +-
 CHANGES                                            |  11 +++++
 CMakeLists.txt                                     |   4 +-
 GammaRayConfig.cmake.in                            |   3 ++
 client/client.cpp                                  |  12 ++---
 client/client.h                                    |   2 +-
 cmake/GammaRayMacros.cmake                         |   2 +-
 common/endpoint.cpp                                |   1 -
 common/paths.cpp                                   |  19 ++++++--
 core/remote/server.cpp                             |   8 +++-
 debian.changelog                                   |   6 +++
 docs/manual/CMakeLists.txt                         |  28 ++++++++---
 docs/manual/gammaray-action-inspector.qdoc         |  37 +++++++++++++++
 docs/manual/gammaray-font-browser.qdoc             |  38 +++++++++++++++
 docs/manual/gammaray-locales.qdoc                  |   2 +-
 docs/manual/gammaray-manual-offline.qdocconf.in    |  20 ++++++++
 docs/manual/gammaray-manual-online.qdocconf.in     |   2 +
 docs/manual/gammaray-manual.qdoc                   |   4 ++
 docs/manual/gammaray-manual.qdocconf.in            |  19 --------
 docs/manual/gammaray-metaobject-browser.qdoc       |   4 +-
 docs/manual/gammaray-objectinspector.qdoc          |   2 +-
 docs/manual/gammaray-qresource-browser.qdoc        |  42 +++++++++++++++++
 docs/manual/gammaray-state-machine-debugger.qdoc   |   2 +-
 docs/manual/gammaray-styles.qdoc                   |   2 +-
 docs/manual/gammaray-tools.qdoc                    |   9 ++--
 ...ray-styles.qdoc => gammaray-web-inspector.qdoc} |  26 +++++------
 docs/manual/images/gammaray-action-inspector.png   | Bin 0 -> 133154 bytes
 docs/manual/images/gammaray-font-browser.png       | Bin 0 -> 114684 bytes
 docs/manual/images/gammaray-qrc-browser.png        | Bin 0 -> 122490 bytes
 docs/manual/images/gammaray-web-inspector.png      | Bin 0 -> 169115 bytes
 gammaray-qt4.dsc                                   |   4 +-
 gammaray-qt4.spec                                  |   4 +-
 gammaray.dsc                                       |   4 +-
 gammaray.spec                                      |   4 +-
 plugins/actioninspector/actioninspectorwidget.cpp  |   2 +
 .../gammaray_actioninspector_ui.desktop.in         |   1 +
 plugins/codecbrowser/codecmodel.cpp                |  51 +++++----------------
 plugins/codecbrowser/codecmodel.h                  |  20 +++-----
 .../gammaray_codecbrowser_ui.desktop.in            |   1 +
 .../fontbrowser/gammaray_fontbrowser_ui.desktop.in |   1 +
 plugins/guisupport/gammaray_guisupport.desktop     |   3 +-
 plugins/guisupport/gammaray_guisupport_ui.desktop  |   2 +-
 .../kjobtracker/gammaray_kjobtracker_ui.desktop.in |   1 +
 .../gammaray_objectvisualizer_ui.desktop.in        |   1 +
 .../geometryextension/qt3dgeometryextension.cpp    |   4 +-
 .../geometryextension/qt3dgeometrytab.h            |   2 +-
 .../gammaray_sceneinspector_ui.desktop.in          |   1 +
 .../gammaray_scriptenginedebugger_ui.desktop.in    |   1 +
 .../gammaray_selectionmodelinspector_ui.desktop.in |   1 +
 .../gammaray_signalmonitor_ui.desktop.in           |   1 +
 .../gammaray_styleinspector_ui.desktop.in          |   1 +
 .../gammaray_textdocumentinspector_ui.desktop      |   1 +
 plugins/timertop/gammaray_timertop_ui.desktop.in   |   1 +
 .../gammaray_webinspector_ui.desktop.in            |   1 +
 .../gammaray_widgetinspector_ui.desktop.in         |   1 +
 plugins/widgetinspector/overlaywidget.cpp          |  26 ++++-------
 .../waextension/widgetattributetab.cpp             |   1 +
 .../waextension/widgetattributetab.ui              |   9 +++-
 plugins/widgetinspector/widgetinspectorserver.cpp  |  12 ++++-
 tests/CMakeLists.txt                               |  12 +++++
 ...ontdatabasemodeltest.cpp => codecmodeltest.cpp} |  30 ++++++++----
 ui/contextmenuextension.cpp                        |  18 +++++++-
 ui/mainwindow.cpp                                  |   3 ++
 .../objectinspector/applicationattributetab.cpp    |   1 +
 .../objectinspector/applicationattributetab.ui     |   9 +++-
 65 files changed, 379 insertions(+), 163 deletions(-)

-- 
gammaray packaging