Merge branch 'master' into braindump-frameworks-somsubhra
2d6ad3ae6b41
Actions

Authored by somsubhrabairi.

Description

Merge branch 'master' into braindump-frameworks-somsubhra

Details

Committed

somsubhrabairi

Sep 3 2015, 7:47 AM

Parents

R8:0fcc192a70e2: Port away KLineEdit and KIcon in braindump
R8:6e14f9c1a45c: Tag another QT5TODO

Branches

Unknown

Tags

Unknown

somsubhrabairi committed R8:2d6ad3ae6b41: Merge branch 'master' into braindump-frameworks-somsubhra (authored by somsubhrabairi).Sep 3 2015, 7:47 AM

Merged Changes

Commit	Author	Details	Committed
6e14f9c1a45c	kossebau	Tag another QT5TODO	Sep 3 2015
c5a580a2c90e	kossebau	Fix initialization order	Sep 3 2015
3a637d554463	kossebau	Move KoSizeGroup as KisSizeGroup from kowidgetutil to kritaui	Sep 2 2015
0cc89eb13627	kossebau	Fix includes of plain KReport headers (which need to be fixed themselves)	Sep 2 2015
f9c1385b9ad5	Yuri Chornoivan	Fix typos	Sep 2 2015
3e622e3668fb	Yuri Chornoivan	Fix typos	Sep 2 2015
e7237a590d06	kossebau	Remove obsolete moc includes in Karbon plugins	Sep 2 2015
0be5dc917353	kossebau	Fix TRANSLATION_DOMAIN clash in karbon/plugin/tools	Sep 2 2015
145a771b9d12	kossebau	Note removal of Calligra Active and mpxj Plan import filter in OBSOLETE.txt	Sep 2 2015
304ad9e94888	kossebau	Remove outdated Calligra Active and unmaintained mpxj Plan import filter	Sep 2 2015
2e78260174f0	kossebau	Install main xnlgui .rc files in KXMLGUI_INSTALL_DIR	Sep 2 2015
506c454cbb19	kossebau	Unbreak build	Sep 2 2015
65a2e2cdfc61	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 2 2015
ccfb59b1a1a3	rempt	BUG:352110 Make the maximum default toolbox button size 22px	Sep 2 2015
905f41ea704e	staniek	Kexi: Fix 'case value evaluates to a big number, cannot be narrowed to int'…	Sep 2 2015
ff6cafd13e00	staniek	Kexi: KToolInvocation -> QDesktopServices	Sep 2 2015
9498eb0694fe	staniek	Kexi: Fix template use (clang)	Sep 2 2015
0dd28d98d02b	staniek	Kexi: Unused args--	Sep 2 2015
dd4c02e17c99	stefanobonicatti/rempt	Fix bundle and preset loading	Sep 2 2015
8aefc34712b4	l10n daemon script	SVN_SILENT made messages (after extraction)	Sep 2 2015

Changes (148)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			CalligraProducts.cmake
	M			OBSOLETE.TXT
	M			README.PACKAGERS
	D			active
	D			active/CMakeLists.txt
	D			active/CalligraActive.qrc
	D			active/Mainpage.dox
	D			active/Messages.sh
	D			active/README
	D			active/calligra_active_global.h.in
	D			active/calligraactive.desktop
	D			active/images
	D			active/images/calligra-logo.png
	D			active/images/fabrictexture.png
	D			active/main.cpp
	D			active/qml
	D			active/qml/AboutCalligraActive.qml
	D			active/qml/Button.qml
	D			active/qml/CanvasContainer.qml
	D			active/qml/Doc.qml
	D			active/qml/DocumentTypeSelector.qml
	D			active/qml/FindToolbar.qml
	D			active/qml/HomeScreen.qml
	D			active/qml/PresentationCenterOverlay.qml
	D			active/qml/PresentationLeftToolbar.qml
	D			active/qml/PresentationRightToolbar.qml
	D			active/qml/PresentationTopToolbar.qml
	D			active/qml/RecentFiles.qml
	D			active/qml/SlideSelector.qml
	D			active/qml/SpreadsheetLeftToolbar.qml
	D			active/qml/SpreadsheetRightToolbar.qml
	D			active/qml/Test.qml
	D			active/qml/TextDocumentCenterOverlay.qml
	D			active/qml/TextDocumentEditingToolbar.qml
	D			active/qml/Toolbars.qml
	D			active/src
	D			active/src/CAAbstractDocumentHandler.cpp
	D			active/src/CAAbstractDocumentHandler.h
	D			active/src/CACanvasController.cpp
	D			active/src/CACanvasController.h
	D			active/src/CACanvasItem.cpp
	D			active/src/CACanvasItem.h
	D			active/src/CADocumentController.cpp
	D			active/src/CADocumentController.h
	D			active/src/CADocumentInfo.cpp
	D			active/src/CADocumentInfo.h
	D			active/src/CAImageProvider.cpp
	D			active/src/CAImageProvider.h
	D			active/src/CAPADocumentModel.cpp
	D			active/src/CAPADocumentModel.h
	D			active/src/CAPAView.cpp
	D			active/src/CAPAView.h
	D			active/src/CAPresentationHandler.cpp
	D			active/src/CAPresentationHandler.h
	D			active/src/CASpreadsheetHandler.cpp
	D			active/src/CASpreadsheetHandler.h
	D			active/src/CATextDocumentHandler.cpp
	D			active/src/CATextDocumentHandler.h
	D			active/src/CATextDocumentModel.cpp
	D			active/src/CATextDocumentModel.h
	D			active/src/MainWindow.cpp
	D			active/src/MainWindow.h
	M			filters/CMakeLists.txt
	D			filters/plan
	D			filters/plan/CMakeLists.txt
	D			filters/plan/mpxj
	D			filters/plan/mpxj/CMakeLists.txt
	D			filters/plan/mpxj/import
	D			filters/plan/mpxj/import/CMakeLists.txt
	D			filters/plan/mpxj/import/calligra_filter_mpp2plan.desktop
	D			filters/plan/mpxj/import/calligra_filter_mpx2plan.desktop
	D			filters/plan/mpxj/import/calligra_filter_planner2plan.desktop
	D			filters/plan/mpxj/import/calligra_planner_mpp.xml
	D			filters/plan/mpxj/import/mpxjimport.cpp
	D			filters/plan/mpxj/import/mpxjimport.h
	D			filters/plan/mpxj/planconvert
	D			filters/plan/mpxj/planconvert/CMakeLists.txt
	D			filters/plan/mpxj/planconvert/README
	D			filters/plan/mpxj/planconvert/build.xml
	D			filters/plan/mpxj/planconvert/dtd
	D			filters/plan/mpxj/planconvert/dtd/plan.dtd
	D			filters/plan/mpxj/planconvert/generatedtdclasses
	D			filters/plan/mpxj/planconvert/jar
	D			filters/plan/mpxj/planconvert/jar/PlanConvert.jar
	D			filters/plan/mpxj/planconvert/mpxjconfig.h.in
	D			filters/plan/mpxj/planconvert/src
	D			filters/plan/mpxj/planconvert/src/plan
	D			filters/plan/mpxj/planconvert/src/plan/PlanConvert.java
	D			filters/plan/mpxj/planconvert/src/plan/PlanWriter.java
	M			flow/part/CMakeLists.txt
	M			karbon/data/CMakeLists.txt
	M			karbon/plugins/filtereffects/BlendEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/BlurEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/ComponentTransferEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/CompositeEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/FloodEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/ImageEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/MergeEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/MorphologyEffectConfigWidget.cpp
	M			karbon/plugins/filtereffects/OffsetEffectConfigWidget.cpp
	M			karbon/plugins/tools/CMakeLists.txt
	M			karbon/plugins/tools/filterEffectTool/FilterEffectEditWidget.cpp
	M			karbon/plugins/tools/filterEffectTool/FilterEffectScene.cpp
	M			karbon/plugins/tools/filterEffectTool/FilterResourceServerProvider.cpp
	M			kexi/core/KexiCommandLineOptions.cpp
	M			kexi/kexi.appdata.xml
	M			kexi/kexi.desktop
	M			kexi/kexiutils/utils.cpp
	M			kexi/main/KexiBugReportDialog.cpp
	M			kexi/main/startup/KexiRecentProjectsModel.h
	M			kexi/main/startup/KexiTemplatesModel.h
	M			kexi/main/startup/KexiWelcomeStatusBar.cpp
	M			kexi/plugins/forms/kexi_formplugin.desktop
	M			kexi/plugins/reports/kexi_reportplugin.desktop
	M			kexi/plugins/tables/kexi_tableplugin.desktop
	M			kexi/widget/utils/kexidisplayutils.cpp
	M			krita/image/brushengine/kis_paintop_preset.cpp
	M			krita/plugins/extensions/dockers/advancedcolorselector/kis_shade_selector_line.cpp
	M			krita/plugins/extensions/imagesize/dlg_canvassize.cc
	M			krita/plugins/extensions/imagesize/dlg_imagesize.cc
	M			krita/plugins/extensions/modify_selection/dlg_border_selection.cc
	M			krita/plugins/extensions/modify_selection/dlg_feather_selection.cc
	M			krita/plugins/extensions/modify_selection/dlg_grow_selection.cc
	M			krita/plugins/extensions/modify_selection/dlg_shrink_selection.cc
	M			krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
	M			krita/ui/CMakeLists.txt
	M			krita/ui/canvas/kis_canvas2.cpp
	M			krita/ui/kis_md5_generator.cpp
	M			krita/ui/widgets/kis_advanced_color_space_selector.cc
	V			{krita/ui/widgets/kis_size_group.cpp ← libs/widgetutils/KoSizeGroup.cpp}
	V			{krita/ui/widgets/kis_size_group.h ← libs/widgetutils/KoSizeGroup.h}
	V			{krita/ui/widgets/kis_size_group_p.cpp ← libs/widgetutils/KoSizeGroupPrivate.cpp}
	V			{krita/ui/widgets/kis_size_group_p.h ← libs/widgetutils/KoSizeGroupPrivate.h}
	M			libs/widgets/KoDocumentInfoDlg.cpp
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgetutils/CMakeLists.txt
	V			{libs/widgetutils/KoSizeGroup.cpp → krita/ui/widgets/kis_size_group.cpp}
	V			{libs/widgetutils/KoSizeGroup.h → krita/ui/widgets/kis_size_group.h}
	V			{libs/widgetutils/KoSizeGroupPrivate.cpp → krita/ui/widgets/kis_size_group_p.cpp}
	V			{libs/widgetutils/KoSizeGroupPrivate.h → krita/ui/widgets/kis_size_group_p.h}
	M			plan/libs/ui/reports/reportview.cpp
	M			plugins/textshape/dialogs/SectionsSplitDialog.ui
	M			sheets/CMakeLists.txt
	M			stage/part/CMakeLists.txt
	M			words/part/CMakeLists.txt