[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasmate/terietor/porting] plasmate: Merge branch 'frameworks_plasmate_startpage' into terietor/por
From: Antonis Tsiapaliokas <kok3rs () gmail ! com>
Date: 2014-03-11 18:28:53
Message-ID: E1WNRQ5-0006EI-MT () scm ! kde ! org
[Download RAW message or body]
Git commit 9e724d86b638da9fc00ba13fce5bd2f28084da1c by Antonis Tsiapaliokas.
Committed on 11/03/2014 at 18:26.
Pushed by tsiapaliokas into branch 'terietor/porting'.
Merge branch 'frameworks_plasmate_startpage' into terietor/porting
We need the mainwindow in order to continue the porting
Conflicts:
plasmate/tests/ui/CMakeLists.txt
M +2 -6 plasmate/editors/editpage.cpp
M +23 -2 plasmate/tests/ui/CMakeLists.txt
http://commits.kde.org/plasmate/9e724d86b638da9fc00ba13fce5bd2f28084da1c
diff --cc plasmate/tests/ui/CMakeLists.txt
index 5b38eea,a2d588c..e8f10cc
--- a/plasmate/tests/ui/CMakeLists.txt
+++ b/plasmate/tests/ui/CMakeLists.txt
@@@ -36,14 -32,19 +41,30 @@@ plasmate_ui_test(editpagetest "${editpa
"${editpagetest_SRCS}"
"${editpagetest_LIBS}"
)
+ set(startpagetest_SRCS startpagetest.cpp
+ ../../startpage.cpp
+ ../../projectmanager/projectmanager.cpp
+ ../../projecthandler.cpp
+ ../../packagehandler.cpp
+ ../../editors/metadata/metadatahandler.cpp
+ )
+ =
-set(startpagetest_UI ../../startpage.ui)
-
+ set(startpagetest_LIBS KF5::Archive KF5::Plasma KF5::I18n KF5::KIOCore KF=
5::KIOWidgets KF5::NewStuff)
+ =
+ plasmate_ui_test(startpagetest "${startpagetest_UI}"
+ "${startpagetest_SRCS}"
+ "${startpagetest_LIBS}"
+ )
++
++set(startpagetest_UI ../../startpage.ui)
+
+set(noteseditortest_SRCS ../../noteseditor/noteseditor.cpp)
+
+set(noteseditortest_LIBS KF5::Service KF5::Parts KF5::TextEditor
+ KF5::I18n Qt5::Widgets)
+
+plasmate_ui_test(noteseditortest ""
+ "${noteseditortest_SRCS}"
+ "${noteseditortest_LIBS}"
+)
+
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic