From 9e8ec0fcd5c873b7b8ffe9b24a5f98d3a98b8e8b Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Mar 2018 18:23:51 +0100 Subject: [PATCH] Split Qt-specific config from other config So adding Qt-specific config does not require a change in c++utilities anymore. --- cmake/templates/config.h.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/templates/config.h.in b/cmake/templates/config.h.in index 36891b2..5c53002 100644 --- a/cmake/templates/config.h.in +++ b/cmake/templates/config.h.in @@ -12,15 +12,15 @@ #define APP_URL "@META_APP_URL@" #define APP_DESCRIPTION "@META_APP_DESCRIPTION@" #define APP_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" -#define QT_TRANSLATION_FILES {@QT_TRANSLATION_FILES_ARRAY@} -#define APP_SPECIFIC_QT_TRANSLATION_FILES {@APP_SPECIFIC_QT_TRANSLATION_FILES_ARRAY@} -#define ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES@ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES@ #define DEPENCENCY_VERSIONS {@DEPENCENCY_VERSIONS_ARRAY@} #define STATIC_DEPENCENCY_VERSIONS {@STATIC_DEPENCENCY_VERSIONS_ARRAY@} -#cmakedefine SVG_SUPPORT -#cmakedefine SVG_ICON_SUPPORT -#cmakedefine IMAGE_FORMAT_SUPPORT -#define IMPORT_IMAGE_FORMAT_PLUGINS @IMAGE_FORMAT_SUPPORT_ARRAY@ -#define IMPORT_WIDGET_STYLE_PLUGINS @WIDGET_STYLE_PLUGINS_ARRAY@ + +// include qtconfig.h for backward compatibility +// FIXME: remove this in v5 +#cmakedefine QT_CONFIGURED +#ifdef QT_CONFIGURED +#include "./qtconfig.h" +#endif + @META_CUSTOM_CONFIG@ #endif // @META_PROJECT_VARNAME_UPPER@_CONFIG