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

List:       kde-commits
Subject:    [analitza/kf5] /: adapt to changes in kf5
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2014-02-24 16:51:25
Message-ID: E1WHykX-0006rz-1i () scm ! kde ! org
[Download RAW message or body]

Git commit f89cc32fc2a5cac6a45dca43af4e365103317a78 by Aleix Pol.
Committed on 24/02/2014 at 16:51.
Pushed by apol into branch 'kf5'.

adapt to changes in kf5

M  +3    -1    CMakeLists.txt
M  +1    -1    analitza/importqobjectmetatype.cpp
M  +2    -5    analitzaplot/examples/plots3ddemo.cpp

http://commits.kde.org/analitza/f89cc32fc2a5cac6a45dca43af4e365103317a78

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5172196..e3e521d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,13 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
 set(QT_REQUIRED_VERSION 5.2)
 find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Xml Svg OpenGL Test Qml Quick)
-find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
 include(ECMAddTests)
+include(KDEInstallDirs)
+include(KDEFrameworkCompilerSettings)
+include(KDECMakeSettings)
 
 ecm_setup_version(5.0.0 VARIABLE_PREFIX ANALITZA
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/analitza_version.h"
diff --git a/analitza/importqobjectmetatype.cpp b/analitza/importqobjectmetatype.cpp
index 22adad7..9c60702 100644
--- a/analitza/importqobjectmetatype.cpp
+++ b/analitza/importqobjectmetatype.cpp
@@ -143,7 +143,7 @@ void ImportQMetaObject::import(const QMetaObject& t)
 	
 	if(t.superClass()) {
 		QObjectCastToParent *cast = new QObjectCastToParent(t.className(), t.superClass()->className());
-		b->insertFunction(classname+"_toParent", cast->type(), cast);
+		b->insertFunction(classname+QStringLiteral("_toParent"), cast->type(), cast);
 	}
 }
 
diff --git a/analitzaplot/examples/plots3ddemo.cpp b/analitzaplot/examples/plots3ddemo.cpp
index 174b5f7..fe3fde2 100644
--- a/analitzaplot/examples/plots3ddemo.cpp
+++ b/analitzaplot/examples/plots3ddemo.cpp
@@ -21,15 +21,12 @@
 #include <qsplitter.h>
 #include <QVBoxLayout>
 #include <QStatusBar>
-
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <qapplication.h>
 
 #include "analitzaplot/surface.h"
 #include "analitzaplot/spacecurve.h"
 #include "analitzaplot/plotsmodel.h"
-#include <analitzagui/plotsview3d.h>
+#include "plotsview3d.h"
 #include <plotsfactory.h>
 #include <analitza/expression.h>
 #include <QCommandLineParser>
[prev in list] [next in list] [prev in thread] [next in thread]