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

List:       kde-commits
Subject:    [pairs/frameworks] /: fighting with KTar :)
From:       Marco Calignano <marco.calignano () gmail ! com>
Date:       2014-07-05 11:40:43
Message-ID: E1X3OKh-0000hf-0M () scm ! kde ! org
[Download RAW message or body]

Git commit 745d267db48c6d0141eefc8742243fcb8cb69172 by Marco Calignano.
Committed on 05/07/2014 at 11:40.
Pushed by calignano into branch 'frameworks'.

fighting with KTar :)

M  +2    -1    CMakeLists.txt
M  +1    -1    game/CMakeLists.txt
M  +1    -1    game/pairstheme.h
M  +1    -1    pairseditor/mainwindow.cpp

http://commits.kde.org/pairs/745d267db48c6d0141eefc8742243fcb8cb69172

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1881a1..ac1d6f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,8 @@ include(KDECompilerSettings)
 include(FeatureSummary)
 =

 find_package(Qt5 REQUIRED COMPONENTS Widgets)
-find_package(KF5 REQUIRED COMPONENTS CoreAddons Solid)
+find_package(KF5 REQUIRED COMPONENTS Archive CoreAddons Solid)
+
 =

 add_subdirectory( game )
 add_subdirectory( pairseditor )
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index da88f5c..d7f5f5b 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -42,7 +42,7 @@ add_executable(pairs ${pairs_SRCS})
 =

 =

 target_link_libraries(pairs Qt5::Core Qt5::Gui QT5::Xml KF5::KIOCore KF5::=
KI18n
-{KCoreAddons_LIBRARIES} KDE5::Phonon
+{KCoreAddons_LIBRARIES} KDE5::Phonon KDE5::Archive
 )
 =

 install(TARGETS pairs ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/game/pairstheme.h b/game/pairstheme.h
index 6298a59..44f12a2 100644
--- a/game/pairstheme.h
+++ b/game/pairstheme.h
@@ -26,7 +26,7 @@
 #ifdef Q_OS_WIN
 #include <KZip>
 #else
-#include <KTar>
+#include <KArchive/KTar>
 #endif
 #include <QtXml/QXmlStreamReader>
 #include <QtGui/QStandardItem>
diff --git a/pairseditor/mainwindow.cpp b/pairseditor/mainwindow.cpp
index ebdfd5d..ef206fe 100644
--- a/pairseditor/mainwindow.cpp
+++ b/pairseditor/mainwindow.cpp
@@ -37,7 +37,7 @@
 #include <KStandardAction>
 #include <kdeversion.h>
 #include <KUrlRequester>
-#include <KTar>
+#include <KArchive/KTar>
 #include <KActionCollection>
 =

 MainWindow::MainWindow(QWidget *parent)
[prev in list] [next in list] [prev in thread] [next in thread]