Merge branch 'release/19.12'
70b0ed6b740a
Actions

Authored by mgallien on Dec 22 2019, 9:12 PM.

Description

Merge branch 'release/19.12'

Committed

mgallien

Dec 22 2019, 9:12 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
2123f3cb5f58	mgallien	Merge branch 'fixConfig' into 'release/19.12'	Dec 22 2019
1e328cd90eee	mgallien	convert KCM based configuration dialog to a simple dialog	Dec 22 2019
0f7e8b7d97bb	mgallien	fix compilation without Baloo	Dec 22 2019

				Path	Packages
	M			src/CMakeLists.txt
	M			src/elisaapplication.cpp
	M			src/elisaapplication.h
	M			src/elisaqmlplugin.cpp
	D			src/localFileConfiguration/CMakeLists.txt
	D			src/localFileConfiguration/Messages.sh
	V			src/localFileConfiguration/{elisaconfigurationdialog.cpp ← localfileconfiguration.cpp}
	V			src/localFileConfiguration/{elisaconfigurationdialog.h ← localfileconfiguration.h}
	D			src/localFileConfiguration/kcm_elisa_local_file.desktop
	V			src/localFileConfiguration/{localfileconfiguration.cpp → elisaconfigurationdialog.cpp}
	V			src/localFileConfiguration/{localfileconfiguration.h → elisaconfigurationdialog.h}
	D			src/localFileConfiguration/package
	D			src/localFileConfiguration/package/contents
	D			src/localFileConfiguration/package/contents/ui
	V			src/{localFileConfiguration/package/contents/ui/main.qml → qml/ElisaConfigurationDialog.qml}
	D			src/localFileConfiguration/package/metadata.desktop
	M			src/main.cpp
	M			src/musiclistenersmanager.cpp
	V			src/{qml/ElisaConfigurationDialog.qml ← localFileConfiguration/package/contents/ui/main.qml}
	M			src/resources.qrc