Fix build with Qt 5.14
72651c36d900
Actions

Authored by arojas on Dec 21 2019, 1:48 PM.

Description

Fix build with Qt 5.14

The 'using namespace Magick;' line causes a conflict between ImageMagick's WarningType and Qt's one with Qt 5.14, so move it after the Qt imports.

Committed

arojas

Dec 21 2019, 1:48 PM

Differential Revision

D26144: Fix build with Qt 5.14

Parents

R482:cff33fbc9c7c: Fix build with opencv 4.2

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			core/app/main/main.cpp
	M			core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
	M			core/showfoto/main/main.cpp
	M			core/tests/dimg/magickloader.cpp