From 50c0a78728e55c0a388337670097c0ac84f2595a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 31 Jan 2016 18:44:04 +0200 Subject: [PATCH] the declarative component does not depends on the svg component Signed-off-by: Ivailo Monev --- src/declarative/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt index 3b901ea1c..d355ead3e 100644 --- a/src/declarative/CMakeLists.txt +++ b/src/declarative/CMakeLists.txt @@ -3,8 +3,7 @@ add_definitions( -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_OPENTYPE ) -# XXX: make QtSvg conditional? -set(EXTRA_DECLARATIVE_LIBS KtCore KtGui KtNetwork KtScript KtSvg KtXmlPatterns KtSql) +set(EXTRA_DECLARATIVE_LIBS KtCore KtGui KtNetwork KtScript KtXmlPatterns KtSql) set(DECLARATIVE_PUBLIC_HEADERS ${DECLARATIVE_PUBLIC_HEADERS} @@ -48,8 +47,6 @@ include_directories( ${CMAKE_BINARY_DIR}/privateinclude/QtNetwork ${CMAKE_BINARY_DIR}/include/QtScript ${CMAKE_BINARY_DIR}/privateinclude/QtScript - ${CMAKE_BINARY_DIR}/include/QtSvg - ${CMAKE_BINARY_DIR}/privateinclude/QtSvg ${CMAKE_BINARY_DIR}/include/QtXmlPatterns ${CMAKE_BINARY_DIR}/privateinclude/QtXmlPatterns ${CMAKE_BINARY_DIR}/include/QtDeclarative @@ -93,7 +90,7 @@ katie_generate_package( KtDeclarative "" "${EXTRA_DECLARATIVE_LIBS}" - "KtCore KtGui KtNetwork KtScript KtSvg KtXmlPatterns KtSql" + "KtCore KtGui KtNetwork KtScript KtXmlPatterns KtSql" ) install( -- 2.11.0