[SCM] gammaray packaging branch, master, updated. debian/1.2.2-1-15-g6fbd840

Jakub Adam xhaakon-guest at alioth.debian.org
Mon Jan 28 21:49:11 UTC 2013


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

The following commit has been merged in the master branch:
commit e4f246934f1efd15b57c17b606c60a934e99ea72
Merge: 2f9debd7d0b69e28463862f11475f13d82baff95 7af59a4fa4bd183c669c0b2567fd8250eb5bea4f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jan 28 18:27:12 2013 +0100

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 .krazy                                             |   12 +-
 3rdparty/other/modelutils.cpp                      |   46 +++++
 3rdparty/other/modelutils.h                        |   52 +++++
 CHANGES                                            |    7 +
 CMakeLists.txt                                     |  105 +++++++++--
 Doxyfile                                           |    2 +-
 ReadMe.txt                                         |   26 +++-
 add_license_blurb.sh                               |    2 +-
 cmake/ECMQt4To5Porting.cmake                       |    2 +-
 cmake/FindGraphviz.cmake                           |    2 +-
 cmake/FindQt5Transitional.cmake                    |   65 ------
 cmake/GammaRayMacros.cmake                         |   17 ++-
 config-gammaray.h.cmake                            |    4 +
 core/CMakeLists.txt                                |   41 +++-
 core/aboutpluginsdialog.cpp                        |   14 +-
 core/aboutpluginsdialog.h                          |    5 +-
 core/connectionfilterproxymodel.cpp                |    2 +-
 core/connectionfilterproxymodel.h                  |    4 +-
 core/connectionmodel.cpp                           |    6 +-
 core/connectionmodel.h                             |    2 +-
 core/hooking/abstractfunctionoverwriter.cpp        |    2 +-
 core/hooking/abstractfunctionoverwriter.h          |    2 +-
 core/hooking/functionoverwriterfactory.cpp         |    2 +-
 core/hooking/functionoverwriterfactory.h           |    2 +-
 core/hooking/unixfunctionoverwriter.cpp            |    2 +-
 core/hooking/unixfunctionoverwriter.h              |    2 +-
 core/hooking/winfunctionoverwriter.cpp             |    2 +-
 core/hooking/winfunctionoverwriter.h               |    2 +-
 core/mainwindow.cpp                                |  122 +++++++++---
 core/mainwindow.h                                  |    2 +-
 core/metaobject.cpp                                |    2 +-
 core/metaobject.h                                  |    2 +-
 core/metaobjectmodel.h                             |   25 ++-
 core/metaobjectrepository.cpp                      |   55 +++---
 core/metaobjectrepository.h                        |    2 +-
 core/metaobjecttreemodel.cpp                       |  197 ++++++++++++++++++
 core/metaobjecttreemodel.h                         |   85 ++++++++
 core/metaproperty.cpp                              |    2 +-
 core/metaproperty.h                                |    2 +-
 core/metapropertymodel.cpp                         |    2 +-
 core/metapropertymodel.h                           |    2 +-
 core/methodargumentmodel.cpp                       |   13 +-
 core/methodargumentmodel.h                         |    6 +-
 core/methodinvocationdialog.cpp                    |    7 +-
 core/methodinvocationdialog.h                      |    4 +-
 core/multisignalmapper.cpp                         |    7 +-
 core/multisignalmapper.h                           |    2 +-
 core/objectclassinfomodel.cpp                      |    2 +-
 core/objectclassinfomodel.h                        |    2 +-
 core/objectdynamicpropertymodel.cpp                |    2 +-
 core/objectdynamicpropertymodel.h                  |    2 +-
 core/objectenummodel.cpp                           |    6 +-
 core/objectenummodel.h                             |    4 +-
 core/objectlistmodel.cpp                           |    2 +-
 core/objectlistmodel.h                             |    2 +-
 core/objectmethodmodel.cpp                         |    2 +-
 core/objectmethodmodel.h                           |    2 +-
 core/objectpropertymodel.cpp                       |    2 +-
 core/objectpropertymodel.h                         |    2 +-
 core/objectstaticpropertymodel.cpp                 |    8 +-
 core/objectstaticpropertymodel.h                   |    2 +-
 core/objecttreemodel.cpp                           |    7 +-
 core/objecttreemodel.h                             |    2 +-
 core/paintbuffermodel.cpp                          |    2 +-
 core/paintbuffermodel.h                            |    2 +-
 core/paintbufferreplaywidget.cpp                   |    2 +-
 core/paintbufferreplaywidget.h                     |    2 +-
 core/paintbufferviewer.cpp                         |    2 +-
 core/paintbufferviewer.h                           |    2 +-
 core/palettemodel.cpp                              |    2 +-
 core/palettemodel.h                                |    2 +-
 core/pluginmanager.cpp                             |   10 +-
 core/pluginmanager.h                               |   24 ++-
 core/probe.cpp                                     |   30 ++-
 core/probe.h                                       |    8 +-
 core/propertyeditor/palettedialog.cpp              |    2 +-
 core/propertyeditor/palettedialog.h                |    2 +-
 core/propertyeditor/propertycoloreditor.cpp        |    2 +-
 core/propertyeditor/propertycoloreditor.h          |    2 +-
 core/propertyeditor/propertydoublepaireditor.cpp   |    2 +-
 core/propertyeditor/propertydoublepaireditor.h     |    2 +-
 core/propertyeditor/propertyeditorfactory.cpp      |    4 +-
 core/propertyeditor/propertyeditorfactory.h        |    2 +-
 core/propertyeditor/propertyextendededitor.cpp     |    2 +-
 core/propertyeditor/propertyextendededitor.h       |    2 +-
 core/propertyeditor/propertyfonteditor.cpp         |    2 +-
 core/propertyeditor/propertyfonteditor.h           |    2 +-
 core/propertyeditor/propertyintpaireditor.cpp      |    2 +-
 core/propertyeditor/propertyintpaireditor.h        |    2 +-
 core/propertyeditor/propertypaletteeditor.cpp      |    2 +-
 core/propertyeditor/propertypaletteeditor.h        |    2 +-
 core/propertywidget.cpp                            |  194 +++++++++++++------
 core/propertywidget.h                              |   30 +++-
 core/propertywidget.ui                             |   19 +-
 core/proxydetacher.cpp                             |    2 +-
 core/proxydetacher.h                               |    2 +-
 core/proxytoolfactory.cpp                          |    7 +-
 core/proxytoolfactory.h                            |    2 +-
 core/readorwritelocker.h                           |    4 +-
 core/sidepane.cpp                                  |    2 +-
 core/sidepane.h                                    |    2 +-
 core/toolmodel.cpp                                 |   16 ++-
 core/toolmodel.h                                   |    2 +-
 core/tools/CMakeLists.txt                          |    5 +-
 core/tools/codecbrowser/codecbrowser.cpp           |    2 +-
 core/tools/codecbrowser/codecbrowser.h             |    2 +-
 core/tools/codecbrowser/codecbrowser.ui            |    5 +-
 core/tools/codecbrowser/codecmodel.cpp             |    2 +-
 core/tools/codecbrowser/codecmodel.h               |    6 +-
 .../connectioninspector/connectioninspector.cpp    |    2 +-
 .../connectioninspector/connectioninspector.h      |    2 +-
 core/tools/fontbrowser/fontbrowser.cpp             |    6 +-
 core/tools/fontbrowser/fontbrowser.h               |    2 +-
 core/tools/fontbrowser/fontbrowser.ui              |    5 +-
 core/tools/fontbrowser/fontmodel.cpp               |    2 +-
 core/tools/fontbrowser/fontmodel.h                 |    4 +-
 core/tools/localeinspector/localeaccessormodel.cpp |   19 +-
 core/tools/localeinspector/localeaccessormodel.h   |    6 +-
 core/tools/localeinspector/localedataaccessor.cpp  |   55 ++++-
 core/tools/localeinspector/localedataaccessor.h    |   36 ++--
 core/tools/localeinspector/localeinspector.cpp     |   26 ++-
 core/tools/localeinspector/localeinspector.h       |    6 +-
 core/tools/localeinspector/localeinspector.ui      |   46 ++++-
 core/tools/localeinspector/localemodel.cpp         |   10 +-
 core/tools/localeinspector/localemodel.h           |    6 +-
 core/tools/messagehandler/backtrace.h              |   21 +-
 core/tools/messagehandler/backtrace_dummy.cpp      |   22 +-
 core/tools/messagehandler/backtrace_unix.cpp       |   21 +-
 core/tools/messagehandler/backtrace_win.cpp        |   23 ++-
 core/tools/messagehandler/messagehandler.cpp       |    2 +-
 core/tools/messagehandler/messagehandler.h         |    2 +-
 core/tools/messagehandler/messagemodel.cpp         |    2 +-
 core/tools/messagehandler/messagemodel.h           |    2 +-
 core/tools/metaobjectbrowser/metaobjectbrowser.cpp |   89 +++++++++
 .../metaobjectbrowser.h}                           |   34 ++--
 core/tools/metatypebrowser/metatypebrowser.cpp     |   10 +-
 core/tools/metatypebrowser/metatypebrowser.h       |    2 +-
 core/tools/metatypebrowser/metatypebrowser.ui      |   33 +++-
 core/tools/metatypebrowser/metatypesmodel.cpp      |  101 +++++++---
 core/tools/metatypebrowser/metatypesmodel.h        |   16 +-
 core/tools/mimetypes/mimetypes.cpp                 |  159 +++++++++++++++
 core/tools/mimetypes/mimetypes.h                   |   80 ++++++++
 core/tools/mimetypes/mimetypes.ui                  |   38 ++++
 core/tools/modelinspector/modelcellmodel.cpp       |   77 +++++---
 core/tools/modelinspector/modelcellmodel.h         |    4 +-
 core/tools/modelinspector/modelinspector.cpp       |    2 +-
 core/tools/modelinspector/modelinspector.h         |    2 +-
 core/tools/modelinspector/modelinspectorwidget.cpp |    9 +-
 core/tools/modelinspector/modelinspectorwidget.h   |    2 +-
 core/tools/modelinspector/modelinspectorwidget.ui  |  168 ++++++++++------
 core/tools/modelinspector/modelmodel.cpp           |    2 +-
 core/tools/modelinspector/modelmodel.h             |    2 +-
 core/tools/modelinspector/modeltester.cpp          |   13 +-
 core/tools/modelinspector/modeltester.h            |    2 +-
 core/tools/objectinspector/objectinspector.cpp     |   17 ++-
 core/tools/objectinspector/objectinspector.h       |    4 +-
 core/tools/resourcebrowser/resourcebrowser.cpp     |    2 +-
 core/tools/resourcebrowser/resourcebrowser.h       |    2 +-
 core/tools/resourcebrowser/resourcefiltermodel.cpp |    2 +-
 core/tools/resourcebrowser/resourcefiltermodel.h   |    2 +-
 core/tools/sceneinspector/graphicssceneview.cpp    |    2 +-
 core/tools/sceneinspector/graphicssceneview.h      |    2 +-
 core/tools/sceneinspector/graphicsview.cpp         |    2 +-
 core/tools/sceneinspector/graphicsview.h           |    2 +-
 core/tools/sceneinspector/sceneinspector.cpp       |    2 +-
 core/tools/sceneinspector/sceneinspector.h         |    2 +-
 core/tools/sceneinspector/scenemodel.cpp           |    2 +-
 core/tools/sceneinspector/scenemodel.h             |    2 +-
 .../selectionmodelinspector.cpp                    |    2 +-
 .../selectionmodelinspector.h                      |    2 +-
 .../standardpaths.cpp}                             |   29 ++--
 .../standardpaths.h}                               |   27 ++--
 .../tools/standardpaths/standardpaths.ui           |   18 +--
 core/tools/standardpaths/standardpathsmodel.cpp    |  129 ++++++++++++
 .../standardpaths/standardpathsmodel.h}            |   33 ++--
 .../styleinspector/abstractstyleelementmodel.cpp   |    2 +-
 .../styleinspector/abstractstyleelementmodel.h     |    2 +-
 .../abstractstyleelementstatetable.cpp             |    2 +-
 .../abstractstyleelementstatetable.h               |    2 +-
 core/tools/styleinspector/complexcontrolmodel.cpp  |   11 +-
 core/tools/styleinspector/complexcontrolmodel.h    |    2 +-
 core/tools/styleinspector/controlmodel.cpp         |    2 +-
 core/tools/styleinspector/controlmodel.h           |    2 +-
 core/tools/styleinspector/dynamicproxystyle.cpp    |    2 +-
 core/tools/styleinspector/dynamicproxystyle.h      |    2 +-
 core/tools/styleinspector/pixelmetricmodel.cpp     |    2 +-
 core/tools/styleinspector/pixelmetricmodel.h       |    2 +-
 core/tools/styleinspector/primitivemodel.cpp       |    2 +-
 core/tools/styleinspector/primitivemodel.h         |    2 +-
 core/tools/styleinspector/standardiconmodel.cpp    |    2 +-
 core/tools/styleinspector/standardiconmodel.h      |    2 +-
 .../styleinspector/styleelementstatetablepage.cpp  |    2 +-
 .../styleinspector/styleelementstatetablepage.h    |    2 +-
 core/tools/styleinspector/styleinspector.cpp       |    2 +-
 core/tools/styleinspector/styleinspector.h         |    2 +-
 core/tools/styleinspector/styleoption.cpp          |    2 +-
 core/tools/styleinspector/styleoption.h            |    2 +-
 .../textdocumentcontentview.cpp                    |    2 +-
 .../textdocumentcontentview.h                      |    2 +-
 .../textdocumentformatmodel.cpp                    |    2 +-
 .../textdocumentformatmodel.h                      |    2 +-
 .../textdocumentinspector.cpp                      |    2 +-
 .../textdocumentinspector/textdocumentinspector.h  |    2 +-
 .../textdocumentinspector/textdocumentmodel.cpp    |    2 +-
 .../textdocumentinspector/textdocumentmodel.h      |    2 +-
 core/tools/widgetinspector/CMakeLists.txt          |    2 +
 core/tools/widgetinspector/overlaywidget.cpp       |    4 +-
 core/tools/widgetinspector/overlaywidget.h         |    4 +-
 core/tools/widgetinspector/uiextractor.cpp         |    5 +-
 core/tools/widgetinspector/uiextractor.h           |    7 +-
 core/tools/widgetinspector/widgetinspector.cpp     |   54 ++++--
 core/tools/widgetinspector/widgetinspector.h       |    4 +-
 .../widgetinspector_export_actions.cpp             |   29 +++-
 core/tools/widgetinspector/widgetpreviewwidget.cpp |    6 +-
 core/tools/widgetinspector/widgetpreviewwidget.h   |    2 +-
 core/tools/widgetinspector/widgettreemodel.cpp     |    5 +-
 core/tools/widgetinspector/widgettreemodel.h       |    2 +-
 core/util.cpp                                      |   18 +-
 debian.changelog                                   |    7 +-
 gammaray.dsc                                       |    6 +-
 gammaray.pod                                       |    2 +-
 gammaray.spec                                      |   24 +--
 include/Mainpage.dox                               |    2 +-
 include/gammaray_export.h                          |    2 +-
 include/metatypedeclarations.h                     |    3 +-
 include/objectmodel.h                              |    2 +-
 include/objectmodelbase.h                          |    9 +-
 include/objecttypefilterproxymodel.h               |    9 +-
 include/probeinterface.h                           |    6 +-
 include/singlecolumnobjectproxymodel.h             |    2 +-
 include/toolfactory.h                              |    6 +-
 include/util.h                                     |    2 +-
 launcher/attachdialog.cpp                          |    2 +-
 launcher/attachdialog.h                            |    2 +-
 launcher/injector/abstractinjector.cpp             |    2 +-
 launcher/injector/abstractinjector.h               |    2 +-
 launcher/injector/gdbinjector.cpp                  |    2 +-
 launcher/injector/gdbinjector.h                    |    2 +-
 launcher/injector/injectorfactory.cpp              |    2 +-
 launcher/injector/injectorfactory.h                |    2 +-
 launcher/injector/injectorstyle.json               |    1 +
 launcher/injector/injectorstyleplugin.cpp          |   16 ++-
 launcher/injector/injectorstyleplugin.h            |    5 +-
 launcher/injector/preloadcheck.cpp                 |    2 +-
 launcher/injector/preloadcheck.h                   |    2 +-
 launcher/injector/preloadinjector.cpp              |    2 +-
 launcher/injector/preloadinjector.h                |    2 +-
 launcher/injector/styleinjector.cpp                |    6 +-
 launcher/injector/styleinjector.h                  |    2 +-
 launcher/injector/windllinjector.cpp               |    2 +-
 launcher/injector/windllinjector.h                 |    2 +-
 launcher/launcherwindow.cpp                        |    2 +-
 launcher/launcherwindow.h                          |    2 +-
 launcher/launcherwindow.ui                         |    2 +-
 launcher/launchpage.cpp                            |    2 +-
 launcher/launchpage.h                              |    2 +-
 launcher/main.cpp                                  |    4 +-
 launcher/probefinder.cpp                           |    2 +-
 launcher/probefinder.h                             |    2 +-
 launcher/processfiltermodel.cpp                    |    5 +-
 launcher/processfiltermodel.h                      |    2 +-
 launcher/processlist_unix.cpp                      |    8 +
 launcher/processmodel.cpp                          |    2 +-
 launcher/processmodel.h                            |    2 +-
 launcher/promolabel.cpp                            |    2 +-
 launcher/promolabel.h                              |    2 +-
 launcher/selftestpage.cpp                          |    2 +-
 launcher/selftestpage.h                            |    2 +-
 launcher/splashscreen.cpp                          |    2 +-
 launcher/splashscreen.h                            |    2 +-
 plugins/CMakeLists.txt                             |    5 +-
 plugins/actioninspector/actioninspector.cpp        |   10 +-
 plugins/actioninspector/actioninspector.h          |    6 +-
 plugins/actioninspector/actionmodel.cpp            |   16 +-
 plugins/actioninspector/actionmodel.h              |    8 +-
 plugins/actioninspector/actionvalidator.cpp        |    2 +-
 plugins/actioninspector/actionvalidator.h          |    4 +-
 plugins/kjobtracker/CMakeLists.txt                 |   52 +++++
 plugins/kjobtracker/gammaray_kjobtracker.desktop   |    4 +
 plugins/kjobtracker/kjobmodel.cpp                  |  209 ++++++++++++++++++++
 .../kjobtracker/kjobmodel.h                        |   54 ++++--
 plugins/kjobtracker/kjobtracker.cpp                |   72 +++++++
 .../kjobtracker/kjobtracker.h                      |   34 ++--
 plugins/kjobtracker/kjobtracker.ui                 |   44 ++++
 plugins/objectvisualizer/objectvisualizer.cpp      |    8 +-
 plugins/objectvisualizer/objectvisualizer.h        |    6 +-
 plugins/objectvisualizer/vtkcontainer.cpp          |    2 +-
 plugins/objectvisualizer/vtkcontainer.h            |    2 +-
 plugins/objectvisualizer/vtkpanel.cpp              |    2 +-
 plugins/objectvisualizer/vtkpanel.h                |    2 +-
 plugins/objectvisualizer/vtkwidget.cpp             |    2 +-
 plugins/objectvisualizer/vtkwidget.h               |    2 +-
 .../scriptenginedebugger/scriptenginedebugger.cpp  |    2 +-
 .../scriptenginedebugger/scriptenginedebugger.h    |   12 +-
 plugins/statemachineviewer/gvgraph/gvgraph.cpp     |    2 +-
 plugins/statemachineviewer/gvgraph/gvgraph.h       |    4 +-
 .../statemachineviewer/gvgraph/gvgraphelements.h   |   38 +++-
 .../statemachineviewer/gvgraph/gvgraphitems.cpp    |   14 +-
 plugins/statemachineviewer/gvgraph/gvgraphitems.h  |   11 +-
 plugins/statemachineviewer/gvgraph/gvtypes.h       |    2 +-
 plugins/statemachineviewer/gvgraph/gvutils.h       |    2 +-
 plugins/statemachineviewer/statemachineview.cpp    |    2 +-
 plugins/statemachineviewer/statemachineview.h      |    2 +-
 plugins/statemachineviewer/statemachineviewer.cpp  |    2 +-
 plugins/statemachineviewer/statemachineviewer.h    |    7 +-
 .../statemachineviewer/statemachineviewerutil.h    |    6 +-
 plugins/statemachineviewer/statemachinewatcher.cpp |    2 +-
 plugins/statemachineviewer/statemachinewatcher.h   |    2 +-
 plugins/statemachineviewer/statemodel.cpp          |    2 +-
 plugins/statemachineviewer/statemodel.h            |    2 +-
 plugins/statemachineviewer/test_main.cpp           |   11 +-
 plugins/statemachineviewer/transitionmodel.cpp     |    2 +-
 plugins/statemachineviewer/transitionmodel.h       |    4 +-
 plugins/timertop/functioncalltimer.cpp             |    2 +-
 plugins/timertop/functioncalltimer.h               |    2 +-
 plugins/timertop/timerinfo.cpp                     |    2 +-
 plugins/timertop/timerinfo.h                       |    2 +-
 plugins/timertop/timermodel.cpp                    |   16 ++-
 plugins/timertop/timermodel.h                      |    9 +-
 plugins/timertop/timertop.cpp                      |    2 +-
 plugins/timertop/timertop.h                        |   13 +-
 plugins/webinspector/CMakeLists.txt                |    1 +
 plugins/webinspector/webinspector.cpp              |    7 +-
 plugins/webinspector/webinspector.h                |   14 +-
 tests/CMakeLists.txt                               |    2 +
 tests/attachhelper.cpp                             |    2 +-
 tests/attachhelper.h                               |    2 +-
 tests/hooktest/main.cpp                            |    2 +-
 tests/hooktest/mainwindow.cpp                      |    2 +-
 tests/hooktest/mainwindow.h                        |    2 +-
 tests/manual/CMakeLists.txt                        |   15 ++
 .../manual/propertywidgettest.cpp                  |   36 ++--
 tests/test_connections.cpp                         |    2 +-
 tests/test_connections.h                           |   10 +-
 334 files changed, 3076 insertions(+), 1050 deletions(-)

-- 
gammaray packaging



More information about the pkg-kde-commits mailing list