merge the platformtheme from branch qt590
021de13fa846
Actions

Authored by rjvbb on Dec 1 2017, 5:02 PM.

Description

merge the platformtheme from branch qt590

Committed from host : Portia.local

Committed

rjvbb

Dec 1 2017, 5:02 PM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v_master_5.11.2

				Path	Packages
	M			CMakeLists.txt
	M			plintegration-cumpatch1.diff
	M			src/CMakeLists.txt
	M			src/platformtheme/CMakeLists.txt
	M			src/platformtheme/kdemactheme.h
	M			src/platformtheme/kdemactheme.mm
	M			src/platformtheme/kdeplatformfiledialogbase_p.h
	M			src/platformtheme/kdeplatformfiledialoghelper.cpp
	M			src/platformtheme/kdeplatformfiledialoghelper.h
	M			src/platformtheme/kdeplatformsystemtrayicon.cpp
	M			src/platformtheme/kdeplatformsystemtrayicon.h
	M			src/platformtheme/kdeplatformtheme.cpp
	M			src/platformtheme/kdeplatformtheme.h
	M			src/platformtheme/kdirselectdialog.cpp
	M			src/platformtheme/kdirselectdialog_p.h
	M			src/platformtheme/kfiletreeview_p.h
	M			src/platformtheme/kfontsettingsdata.cpp
	M			src/platformtheme/kfontsettingsdata.h
	M			src/platformtheme/kfontsettingsdatamac.mm
	M			src/platformtheme/khintssettings.cpp
	M			src/platformtheme/khintssettings.h
	M			src/platformtheme/khintssettingsmac.mm
	M			src/platformtheme/main_cocoa.cpp
	M			src/platformtheme/main_kde.cpp
	M			src/qmacstyle/qmacstyle_mac_p.h