From kde-commits Fri Apr 24 20:20:48 2015 From: Inge Wallin Date: Fri, 24 Apr 2015 20:20:48 +0000 To: kde-commits Subject: [calligra/frameworks] /: Revert "Readd APP_AUTHOR to the build." Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142990696617453 Git commit f94e68026be78b7dc6138d52b557269ab0bf6931 by Inge Wallin. Committed on 24/04/2015 at 10:57. Pushed by ingwa into branch 'frameworks'. Revert "Readd APP_AUTHOR to the build." Reason: built from the wrong directory, so missed a lot of build errors. :/ This reverts commit af0f39e9a3f480f706a1aa57a195e3603eaf6a33. M +1 -1 CalligraProducts.cmake M +1 -1 words/part/author/CAuDocument.cpp M +0 -1 words/part/author/CAuFactory.cpp http://commits.kde.org/calligra/f94e68026be78b7dc6138d52b557269ab0bf6931 diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake index 1ad078b..5b15bbe 100644 --- a/CalligraProducts.cmake +++ b/CalligraProducts.cmake @@ -90,7 +90,7 @@ calligra_define_product(PART_QTQUICK "QtQuick Plugin that= provides Calligra comp calligra_define_product(APP_WORDS "Words app (for Desktop)" REQUIRES PART= _WORDS) calligra_define_product(APP_STAGE "Stage app (for Desktop)" REQUIRES PART= _STAGE) calligra_define_product(APP_SHEETS "Sheets app (for Desktop)" REQUIRES PA= RT_SHEETS) -calligra_define_product(APP_AUTHOR "Author app (for Desktop)" REQUIRES PA= RT_WORDS) +calligra_define_product(APP_AUTHOR "Author app (for Desktop)" UNPORTED RE= QUIRES PART_WORDS) calligra_define_product(APP_KARBON "Karbon app (for Desktop)" REQUIRES LI= B_CALLIGRA) calligra_define_product(APP_KRITA "Krita app (for Desktop)" REQUIRES LIB_C= ALLIGRA) calligra_define_product(APP_KEXI "Kexi app (for Desktop)" UNPORTED REQUIR= ES LIB_CALLIGRA) diff --git a/words/part/author/CAuDocument.cpp b/words/part/author/CAuDocum= ent.cpp index 34ecd95..858605f 100644 --- a/words/part/author/CAuDocument.cpp +++ b/words/part/author/CAuDocument.cpp @@ -23,7 +23,7 @@ = CAuDocument::CAuDocument(KoPart *part) : KWDocument(part) - //, m_metaManager(new CAuMetaDataManager(this)) + , m_metaManager(new CAuMetaDataManager(this)) { } = diff --git a/words/part/author/CAuFactory.cpp b/words/part/author/CAuFactor= y.cpp index 7b4e45f..04fe174 100644 --- a/words/part/author/CAuFactory.cpp +++ b/words/part/author/CAuFactory.cpp @@ -28,7 +28,6 @@ #include #include #include -#include = #include =20