Diffusion digiKam 1fd51fdae823

Merge branch 'master' of invent.kde.org:graphics/digikam
1fd51fdae823
Actions

Authored by cgilles on May 23 2020, 5:15 PM.

Description

Merge branch 'master' of invent.kde.org:graphics/digikam

Details

Committed

cgilles

May 23 2020, 5:15 PM

Parents

R482:23b06313fa34: fix coding style and cppcheck
R482:8876254fd56d: fix compile

Branches

Unknown

Tags

Unknown

cgilles committed R482:1fd51fdae823: Merge branch 'master' of invent.kde.org:graphics/digikam (authored by cgilles).May 23 2020, 5:15 PM

Merged Changes

Commit	Author	Details	Committed
8876254fd56d	mqualmann	fix compile	May 23 2020
d4d5bdb37512	mqualmann	fix file mode	May 23 2020
8c38d7972364	mqualmann	fix compile warning	May 23 2020
3e2ac56ad763	mqualmann	update O2 lib to current git/master - adapt our changes - restore the spelling…	May 23 2020

Changes (53)

		Path
M		core/libs/dplugins/webservices/CMakeLists.txt
M		core/libs/dplugins/webservices/o2/examples/CMakeLists.txt
P		core/libs/dplugins/webservices/o2/examples/facebookdemo/CMakeLists.txt Copied to multiple locations: core/libs/dplugins/webservices/o2/examples/msgraphdemo/CMakeLists.txt core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/CMakeLists.txt core/libs/dplugins/webservices/o2/examples/vimeodemo/CMakeLists.txt core/libs/dplugins/webservices/o2/examples/youtubedemo/CMakeLists.txt
A	(dir)	core/libs/dplugins/webservices/o2/examples/msgraphdemo/
P		core/libs/dplugins/webservices/o2/examples/msgraphdemo/CMakeLists.txt Copied from core/libs/dplugins/webservices/o2/examples/facebookdemo/CMakeLists.txt
A		core/libs/dplugins/webservices/o2/examples/msgraphdemo/main.cpp
A		core/libs/dplugins/webservices/o2/examples/msgraphdemo/msgraphdemo.cpp
A		core/libs/dplugins/webservices/o2/examples/msgraphdemo/msgraphdemo.h
A		core/libs/dplugins/webservices/o2/examples/msgraphdemo/msgraphdemo.pro
A	(dir)	core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/CMakeLists.txt Copied from core/libs/dplugins/webservices/o2/examples/facebookdemo/CMakeLists.txt
A		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/main.cpp
A		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/msgraphdemo.cpp
A		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/msgraphdemo.h
A		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/msgraphexternalinterceptordemo.pro
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webenginepage.cpp Copied from core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webenginepage.cpp
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webenginepage.h Copied from core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webenginepage.h
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webwindow.cpp Copied from core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webwindow.cpp
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webwindow.h Copied from core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webwindow.h
P		core/libs/dplugins/webservices/o2/examples/msgraphexternalinterceptordemo/webwindow.ui Copied from core/libs/dplugins/webservices/o2/examples/facebookexternalinterceptordemo/webwindow.ui
A	(dir)	core/libs/dplugins/webservices/o2/examples/vimeodemo/
P		core/libs/dplugins/webservices/o2/examples/vimeodemo/CMakeLists.txt Copied from core/libs/dplugins/webservices/o2/examples/facebookdemo/CMakeLists.txt
A		core/libs/dplugins/webservices/o2/examples/vimeodemo/main.cpp
A		core/libs/dplugins/webservices/o2/examples/vimeodemo/vimeodemo.cpp
A		core/libs/dplugins/webservices/o2/examples/vimeodemo/vimeodemo.h
A		core/libs/dplugins/webservices/o2/examples/vimeodemo/vimeodemo.pro
A	(dir)	core/libs/dplugins/webservices/o2/examples/youtubedemo/
P		core/libs/dplugins/webservices/o2/examples/youtubedemo/CMakeLists.txt Copied from core/libs/dplugins/webservices/o2/examples/facebookdemo/CMakeLists.txt
A		core/libs/dplugins/webservices/o2/examples/youtubedemo/main.cpp
A		core/libs/dplugins/webservices/o2/examples/youtubedemo/youtubedemo.pro
A		core/libs/dplugins/webservices/o2/examples/youtubedemo/ytdemo.cpp
A		core/libs/dplugins/webservices/o2/examples/youtubedemo/ytdemo.h
M		core/libs/dplugins/webservices/o2/src/CMakeLists.txt
M		core/libs/dplugins/webservices/o2/src/o0abstractstore.h
M		core/libs/dplugins/webservices/o2/src/o0baseauth.cpp
M		core/libs/dplugins/webservices/o2/src/o0baseauth.h
M		core/libs/dplugins/webservices/o2/src/o0globals.h
M		core/libs/dplugins/webservices/o2/src/o0simplecrypt.h
M		core/libs/dplugins/webservices/o2/src/o1.cpp
M		core/libs/dplugins/webservices/o2/src/o1.h
M		core/libs/dplugins/webservices/o2/src/o2.cpp
M		core/libs/dplugins/webservices/o2/src/o2hubic.cpp
A		core/libs/dplugins/webservices/o2/src/o2msgraph.cpp
A		core/libs/dplugins/webservices/o2/src/o2msgraph.h
M		core/libs/dplugins/webservices/o2/src/o2replyserver.cpp
M		core/libs/dplugins/webservices/o2/src/o2replyserver.h
M		core/libs/dplugins/webservices/o2/src/o2requestor.cpp
M		core/libs/dplugins/webservices/o2/src/o2requestor.h
M		core/libs/dplugins/webservices/o2/src/o2simplecrypt.cpp
M		core/libs/dplugins/webservices/o2/src/o2surveymonkey.cpp
M		core/libs/dplugins/webservices/o2/src/o2uber.cpp
A		core/libs/dplugins/webservices/o2/src/o2vimeo.cpp
A		core/libs/dplugins/webservices/o2/src/o2vimeo.h