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

List:       kde-commits
Subject:    [pairs/frameworks] /: adjusting include directories to be able to compile
From:       Marco Calignano <marco.calignano () gmail ! com>
Date:       2014-09-15 20:16:48
Message-ID: E1XTchc-00040W-66 () scm ! kde ! org
[Download RAW message or body]

Git commit 5f7dcfa526b94f975988aebac4e0812567fd254f by Marco Calignano.
Committed on 08/07/2014 at 13:11.
Pushed by calignano into branch 'frameworks'.

adjusting include directories to be able to compile

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

http://commits.kde.org/pairs/5f7dcfa526b94f975988aebac4e0812567fd254f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de425d3..604cedd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 2.8.12)
 =

 project(pairs)
 =

-
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdeprecated-declarations")
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

@@ -33,7 +33,7 @@ include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(FeatureSummary)
 =

-find_package(Qt5 REQUIRED COMPONENTS Widgets Svg)
+find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Quick)
 find_package(KF5 REQUIRED COMPONENTS Archive CoreAddons Solid XmlGui KDELi=
bs4Support)
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 =

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 229d648..5d6c858 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -40,8 +40,9 @@ qt5_add_resources(pairs_SRCS resources.qrc)
 =

 add_executable(pairs ${pairs_SRCS})
 =

+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdeprecated-declarations")
 =

-target_link_libraries(pairs Qt5::Core Qt5::Widgets Qt5::Svg Qt5::Xml KF5::=
KIOCore KF5::KI18n
+target_link_libraries(pairs Qt5::Core Qt5::Widgets Qt5::Quick Qt5::Svg Qt5=
::Xml KF5::KIOCore KF5::KI18n
 KF5::Archive KF5::KDELibs4Support Phonon::phonon4qt5
 )
 =

diff --git a/game/carditem.cpp b/game/carditem.cpp
index 93f4cc8..5ba26b3 100644
--- a/game/carditem.cpp
+++ b/game/carditem.cpp
@@ -37,7 +37,7 @@
 #include <kfontutils.h>
 =

 CardItem::CardItem(const QSharedPointer<QSvgRenderer>& back, QGraphicsItem=
* parent, QGraphicsScene* scene, Phonon::MediaObject *media)
-    : QGraphicsPixmapItem(parent, scene)
+    : QGraphicsPixmapItem(parent)
     , m_type(CARD_NONE)
     , m_activated(false)
     , m_backRenderer(back)
diff --git a/game/pairstheme.h b/game/pairstheme.h
index 44f12a2..6ff1357 100644
--- a/game/pairstheme.h
+++ b/game/pairstheme.h
@@ -28,7 +28,7 @@
 #else
 #include <KArchive/KTar>
 #endif
-#include <QtXml/QXmlStreamReader>
+#include <QXmlStreamReader>
 #include <QtGui/QStandardItem>
 #include "cardtype.h"
 =


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