Merge branch 'master' into petrovic/preferences-ui
565b2c8593b5
Actions

Authored by scottpetrovic on Oct 28 2017, 4:09 PM.

Description

Merge branch 'master' into petrovic/preferences-ui

Details

Committed

Oct 28 2017, 4:09 PM

Parents

R37:8e550aba46ce: describe better what the reset to defaults button does
R37:bbd2129a36c4: Force disabling the availability of deprecated Qt API

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:565b2c8593b5: Merge branch 'master' into petrovic/preferences-ui (authored by scottpetrovic).Oct 28 2017, 4:09 PM

Merged Changes

Commit	Author	Details	Committed
bbd2129a36c4	rempt	Force disabling the availability of deprecated Qt API	Oct 28 2017
fb4250b5f25d	rempt	Remove use of obsolete Qt API from the plugins	Oct 28 2017
18f4fbc40729	rempt	Remove obsolete Qt API calls from libs/libqml	Oct 28 2017
98ff56d8e9a8	rempt	Remove obsolete Qt API calls from main.cc	Oct 28 2017
d5f0d3083e55	rempt	Remove obsolete Qt API calls from libs/widgetutils	Oct 28 2017
c1ac58b4cb6a	rempt	Remove obsolete Qt API calls from libs/widgets	Oct 28 2017
8ce4004fd6b7	rempt	Remove obsolete Qt API calls from libs/vectorimage	Oct 28 2017
be2692ca52e7	rempt	Remove obsolete Qt API calls from libs/ui	Oct 28 2017
e269dc41c5d4	rempt	Remove obsolete Qt API calls from libs/psd	Oct 28 2017
1bdc8b59f6db	rempt	Remove obsolete Qt API calls from libs/libkis	Oct 28 2017
ecd95612c897	rempt	Remove obsolete Qt API calls from libs/image	Oct 28 2017
1cf9bdd68990	rempt	Fix warning	Oct 28 2017
c6473821e095	alvinhochun	ext_gmic: Use exactly gmic 2.1.3	Oct 27 2017

Changes (143)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/ext_gmic/CMakeLists.txt
	D			3rdparty/ext_gmic/gmic-downloads.cmake
	M			CMakeLists.txt
	M			krita/main.cc
	M			libs/image/brushengine/kis_paintop_config_widget.cpp
	M			libs/image/brushengine/kis_paintop_config_widget.h
	M			libs/image/kis_config_widget.cpp
	M			libs/image/kis_config_widget.h
	M			libs/image/kis_convolution_worker_fft.h
	M			libs/image/kis_convolution_worker_spatial.h
	M			libs/image/metadata/kis_meta_data_value.cc
	M			libs/image/tests/kis_paint_device_test.cpp
	M			libs/libkis/Document.cpp
	M			libs/libqml/DocumentListModel.cpp
	M			libs/libqml/DocumentListModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/ColorDepthModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/ColorDepthModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/ColorModelModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/ColorModelModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/ColorProfileModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/ColorProfileModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/CompositeOpModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/CompositeOpModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/FileSystemModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/FiltersCategoryModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/FiltersCategoryModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/FiltersModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/FiltersModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/KeyboardModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/KeyboardModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/LayerModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteColorsModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteColorsModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/PresetModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/PresetModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/RecentImagesModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/RecentImagesModel.h
	M			libs/libqml/plugins/kritasketchplugin/models/TemplatesModel.cpp
	M			libs/libqml/plugins/kritasketchplugin/models/TemplatesModel.h
	M			libs/pigment/KoColorSpace.cpp
	M			libs/psd/asl/kis_asl_reader_utils.h
	M			libs/psd/asl/kis_asl_writer.cpp
	M			libs/psd/asl/kis_asl_writer_utils.cpp
	M			libs/psd/asl/kis_asl_writer_utils.h
	M			libs/psd/asl/kis_asl_xml_parser.cpp
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMultiFeedRSSModel.cpp
	M			libs/ui/KisMultiFeedRSSModel.h
	M			libs/ui/KisOpenPane.cpp
	M			libs/ui/KisPaletteModel.cpp
	M			libs/ui/KisResourceBundle.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/canvas/kis_tool_proxy.cpp
	M			libs/ui/dialogs/kis_dlg_file_layer.cpp
	M			libs/ui/dialogs/kis_dlg_import_image_sequence.cpp
	M			libs/ui/dialogs/kis_dlg_layer_properties.cc
	M			libs/ui/dialogs/kis_dlg_layer_properties.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/input/config/kis_input_configuration_page_item.cpp
	M			libs/ui/input/kis_abstract_input_action.cpp
	M			libs/ui/kis_histogram_view.cc
	M			libs/ui/kis_histogram_view.h
	M			libs/ui/kis_image_manager.cc
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_node_model.cpp
	M			libs/ui/kis_palette_delegate.cpp
	M			libs/ui/kis_palette_view.cpp
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_splash_screen.cpp
	M			libs/ui/kisexiv2/kis_exiv2.cpp
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/tests/modeltest.cpp
	M			libs/ui/widgets/kis_advanced_color_space_selector.cc
	M			libs/ui/widgets/kis_color_space_selector.cc
	M			libs/ui/widgets/kis_curve_widget.cpp
	M			libs/ui/widgets/kis_curve_widget.h
	M			libs/ui/widgets/kis_gradient_slider_widget.cc
	M			libs/ui/widgets/kis_gradient_slider_widget.h
	M			libs/ui/widgets/kis_paintop_presets_save.cpp
	M			libs/ui/widgets/kis_scratch_pad_event_filter.cpp
	M			libs/ui/widgets/kis_stopgradient_slider_widget.cpp
	M			libs/ui/widgets/kis_stopgradient_slider_widget.h
	M			libs/vectorimage/libwmf/WmfParser.cpp
	M			libs/widgets/KoLineStyleModel.cpp
	M			libs/widgets/KoResourceModel.cpp
	M			libs/widgets/kis_file_name_requester.cpp
	M			libs/widgetutils/config/khelpclient.cpp
	M			libs/widgetutils/xmlgui/kbugreport.cpp
	M			libs/widgetutils/xmlgui/khelpmenu.cpp
	M			plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/artisticcolorselector/kis_color_selector.cpp
	M			plugins/dockers/compositiondocker/compositiondocker_dock.cpp
	M			plugins/dockers/compositiondocker/compositionmodel.cpp
	M			plugins/dockers/historydocker/KisUndoModel.cpp
	M			plugins/dockers/imagedocker/image_strip_scene.cpp
	M			plugins/dockers/imagedocker/imagedocker_dock.cpp
	M			plugins/dockers/shapedockers/CollectionItemModel.cpp
	M			plugins/dockers/shapedockers/CollectionItemModel.h
	M			plugins/dockers/shapedockers/SvgSymbolCollectionDocker.cpp
	M			plugins/dockers/shapedockers/SvgSymbolCollectionDocker.h
	M			plugins/dockers/tasksetdocker/tasksetmodel.cpp
	M			plugins/extensions/bigbrother/bigbrother.cc
	M			plugins/extensions/imagesplit/imagesplit.cpp
	M			plugins/extensions/pykrita/plugin/version_checker.h
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			plugins/extensions/resourcemanager/resourcemanager.cpp
	M			plugins/extensions/separate_channels/kis_channel_separator.cc
	M			plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
	M			plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
	M			plugins/filters/colorsfilters/kis_desaturate_filter.cpp
	M			plugins/filters/colorsfilters/kis_desaturate_filter.h
	M			plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
	M			plugins/filters/colorsfilters/kis_hsv_adjustment_filter.h
	M			plugins/filters/colorsfilters/kis_perchannel_filter.cpp
	M			plugins/filters/colorsfilters/kis_perchannel_filter.h
	M			plugins/filters/gradientmap/gradientmap.cpp
	M			plugins/filters/gradientmap/gradientmap.h
	M			plugins/filters/indexcolors/kiswdgindexcolors.cpp
	M			plugins/filters/indexcolors/kiswdgindexcolors.h
	M			plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
	M			plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
	M			plugins/flake/textshape/CMakeLists.txt
	M			plugins/flake/vectorshape/VectorShape.cpp
	M			plugins/flake/vectorshape/VectorTool.cpp
	M			plugins/impex/kra/kra_converter.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/dcrawsettingswidget.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
	M			plugins/paintops/libpaintop/kis_multi_sensors_model_p.cpp
	M			plugins/tools/karbonplugins/filtereffects/ColorMatrixEffectConfigWidget.cpp
	M			plugins/tools/karbonplugins/filtereffects/ConvolveMatrixEffectConfigWidget.cpp
	M			plugins/tools/karbonplugins/filtereffects/MatrixDataModel.cpp
	M			plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectSceneItems.cpp