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

List:       kde-commits
Subject:    [pairs/frameworks] /: Revert "Use KDeclarative to set up the engine"
From:       Marco Calignano <marco.calignano () gmail ! com>
Date:       2014-10-29 20:53:17
Message-ID: E1XjaF3-00034P-D7 () scm ! kde ! org
[Download RAW message or body]

Git commit 897290f3aa6a3d805478aaf43846d242e1109e40 by Marco Calignano.
Committed on 29/10/2014 at 20:40.
Pushed by calignano into branch 'frameworks'.

Revert "Use KDeclarative to set up the engine"

This reverts commit d4a5794512b7eb592311e1d5a86967fbe7686b08.

M  +1    -1    CMakeLists.txt
M  +1    -1    game/CMakeLists.txt
M  +7    -4    game/pairsview.cpp

http://commits.kde.org/pairs/897290f3aa6a3d805478aaf43846d242e1109e40

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72dae61..c1a75e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ include(KDECompilerSettings)
 include(FeatureSummary)
 
 find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Quick XmlPatterns )
-find_package(KF5 REQUIRED COMPONENTS Archive CoreAddons Solid XmlGui KDELibs4Support \
NewStuff Completion KIO Declarative) +find_package(KF5 REQUIRED COMPONENTS Archive \
CoreAddons Solid XmlGui KDELibs4Support NewStuff Completion KIO)  \
find_package(Phonon4Qt5 CONFIG REQUIRED)  
 include_directories(${PHONON_INCLUDES})
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index a1d6d9f..a086257 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -44,7 +44,7 @@ add_executable(pairs ${pairs_SRCS})
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdeprecated-declarations")
 
 target_link_libraries(pairs Qt5::Core Qt5::Widgets Qt5::Quick Qt5::Qml Qt5::Svg \
                Qt5::Xml Qt5::XmlPatterns KF5::KIOCore KF5::I18n
-KF5::Archive KF5::KDELibs4Support Phonon::phonon4qt5 KF5::NewStuff KF5::Declarative
+KF5::Archive KF5::KDELibs4Support Phonon::phonon4qt5 KF5::NewStuff
 )
 
 install(TARGETS pairs ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/game/pairsview.cpp b/game/pairsview.cpp
index f973eb7..ef1081e 100644
--- a/game/pairsview.cpp
+++ b/game/pairsview.cpp
@@ -50,7 +50,6 @@
 #include <QResizeEvent>
 #include <cmath>
 #include <KRandom>
-#include <KDeclarative/KDeclarative>
 //#include <KStandardDirs>
 //#include <kdeclarative.h>
 
@@ -71,10 +70,14 @@ PairsView::PairsView(const QString &file, QWindow *parent)
     rootContext()->setContextProperty("cardModel", m_cards);
     engine()->addImageProvider("theme", m_themeImagesProvider);
 
-    KDeclarative::KDeclarative kdeclarative;
-    kdeclarative.setDeclarativeEngine(engine());
-    kdeclarative.setupBindings();
+/* TODO
+    KDeclarative m_kdeclarative;
+    m_kdeclarative.setDeclarativeEngine(engine());
+    m_kdeclarative.initialize();
+    //binds things like kconfig and icons
+    m_kdeclarative.setupBindings();
 
+*/
     setSource(QUrl("qrc:/qml/Main.qml"));
     Q_ASSERT(errors().isEmpty());
     


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