Diffusion Kexi 977d62e2e574

Merge remote-tracking branch 'origin/3.2'
977d62e2e574
Actions

Authored by staniek on Apr 28 2020, 9:45 PM.

Description

Merge remote-tracking branch 'origin/3.2'

Conflicts:
CMakeLists.txt
src/CMakeLists.txt

Details

Committed

staniek

Apr 28 2020, 9:45 PM

Parents

R71:91b54beb53b4: TRIVIAL Turn http URLs into https
R71:26bd858fc699: Merge remote-tracking branch 'origin/3.2'

Branches

Unknown

Tags

Unknown

staniek committed R71:977d62e2e574: Merge remote-tracking branch 'origin/3.2' (authored by staniek).Apr 28 2020, 9:45 PM

Merged Changes

	Commit			Author	Details	Committed
	91b54beb53b4			staniek	TRIVIAL Turn http URLs into https	Apr 28 2020
	ae0e7f9e1f36			staniek	TRIVIAL No need to warn in KexiDataAwareObjectInterface::hasData()	Apr 28 2020

Changes (43)

				Path	Packages
	M			CMakeLists.txt
	M			cmake/modules/FindGLIB2.cmake
	M			kundo2_aware_xgettext.sh
	M			src/doc/dev/kexi_i18n_guidelines.txt
	M			src/kexiutils/KexiFadeWidgetEffect.cpp
	M			src/kexiutils/KexiJsonTrader.h
	M			src/kexiutils/completer/KexiCompleter.cpp
	M			src/kexiutils/completer/KexiCompleter.h
	M			src/kexiutils/completer/KexiCompleter_p.h
	M			src/kexiutils/completer/private/KexiAbstractItemModel_p.h
	M			src/kexiutils/completer/private/KexiAbstractProxyModel_p.h
	M			src/main/KexiMainWindow.cpp
	M			src/main/KexiUserFeedbackAgent.cpp
	M			src/migration/CMakeLists.txt
	M			src/plugins/reports/KexiDBReportDataSource.cpp
	M			src/plugins/reports/KexiDBReportDataSource.h
	M			src/plugins/reports/keximigratereportdata.cpp
	M			src/plugins/reports/keximigratereportdata.h
	M			src/plugins/reports/kexireportdesignview.cpp
	M			src/plugins/reports/kexireportdesignview.h
	M			src/plugins/reports/kexireportpart.cpp
	M			src/plugins/reports/kexireportpart.h
	M			src/plugins/reports/kexireports.cpp
	M			src/plugins/reports/kexireportview.cpp
	M			src/plugins/reports/kexireportview.h
	M			src/plugins/reports/kexisourceselector.cpp
	M			src/plugins/reports/kexisourceselector.h
	M			src/plugins/reports/krscriptfunctions.cpp
	M			src/plugins/reports/krscriptfunctions.h
	M			src/tools/find_custom_widget_headers_in_ui.sh
	M			src/widget/KexiFileRequester.cpp
	M			src/widget/dataviewcommon/kexidataawareobjectiface.h
	M			src/widget/navigator/KexiProjectNavigator.cpp
	M			src/widget/undo/kundo2group.cpp
	M			src/widget/undo/kundo2group.h
	M			src/widget/undo/kundo2magicstring.h
	M			src/widget/undo/kundo2model.cpp
	M			src/widget/undo/kundo2model.h
	M			src/widget/undo/kundo2stack.cpp
	M			src/widget/undo/kundo2stack.h
	M			src/widget/undo/kundo2stack_p.h
	M			src/widget/undo/kundo2view.cpp
	M			src/widget/undo/kundo2view.h