[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd APP_AUTHOR to the build.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-04-24 10:37:19
Message-ID: E1Ylaz1-0005bm-9e () scm ! kde ! org
[Download RAW message or body]

Git commit af0f39e9a3f480f706a1aa57a195e3603eaf6a33 by Inge Wallin.
Committed on 20/04/2015 at 02:20.
Pushed by ingwa into branch 'frameworks'.

Readd APP_AUTHOR to the build.

Something is wrong with the installation, though.

M  +1    -1    CalligraProducts.cmake
M  +1    -1    words/part/author/CAuDocument.cpp
M  +1    -0    words/part/author/CAuFactory.cpp

http://commits.kde.org/calligra/af0f39e9a3f480f706a1aa57a195e3603eaf6a33

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 5b15bbe..1ad078b 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 PART_SHEETS)
-calligra_define_product(APP_AUTHOR "Author app (for Desktop)" UNPORTED  REQUIRES PART_WORDS)
+calligra_define_product(APP_AUTHOR "Author app (for Desktop)"  REQUIRES PART_WORDS)
 calligra_define_product(APP_KARBON "Karbon app (for Desktop)"  REQUIRES LIB_CALLIGRA)
 calligra_define_product(APP_KRITA "Krita app (for Desktop)" REQUIRES LIB_CALLIGRA)
 calligra_define_product(APP_KEXI "Kexi app (for Desktop)" UNPORTED  REQUIRES LIB_CALLIGRA)
diff --git a/words/part/author/CAuDocument.cpp b/words/part/author/CAuDocument.cpp
index 858605f..34ecd95 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/CAuFactory.cpp
index 04fe174..7b4e45f 100644
--- a/words/part/author/CAuFactory.cpp
+++ b/words/part/author/CAuFactory.cpp
@@ -28,6 +28,7 @@
 #include <author/CAuDocument.h>
 #include <kcomponentdata.h>
 #include <kstandarddirs.h>
+#include <kglobal.h>
 
 #include <kiconloader.h>
 
[prev in list] [next in list] [prev in thread] [next in thread]