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

List:       kde-commits
Subject:    [kdepimlibs/frameworks] kontactinterface/src: Make it compile with -DQT_NO_CAST_FROM_BYTEARRAY
From:       Montel Laurent <montel () kde ! org>
Date:       2014-04-15 5:46:45
Message-ID: E1WZwCj-00017f-Lc () scm ! kde ! org
[Download RAW message or body]

Git commit 303cadad7820775628a79ea9e025ed7f09b3c84f by Montel Laurent.
Committed on 15/04/2014 at 05:34.
Pushed by mlaurent into branch 'frameworks'.

Make it compile with -DQT_NO_CAST_FROM_BYTEARRAY

M  +0    -2    kontactinterface/src/CMakeLists.txt
M  +1    -1    kontactinterface/src/plugin.cpp

http://commits.kde.org/kdepimlibs/303cadad7820775628a79ea9e025ed7f09b3c84f

diff --git a/kontactinterface/src/CMakeLists.txt b/kontactinterface/src/CMa=
keLists.txt
index 8b3972d..228c749 100644
--- a/kontactinterface/src/CMakeLists.txt
+++ b/kontactinterface/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-
 set(kontactinterface_LIB_SRCS
     core.cpp
     plugin.cpp
diff --git a/kontactinterface/src/plugin.cpp b/kontactinterface/src/plugin.=
cpp
index 05f8324..986afbf 100644
--- a/kontactinterface/src/plugin.cpp
+++ b/kontactinterface/src/plugin.cpp
@@ -155,7 +155,7 @@ bool Plugin::isRunningStandalone() const
 =

 KParts::ReadOnlyPart *Plugin::loadPart()
 {
-  return core()->createPart( d->partLibraryName );
+  return core()->createPart( d->partLibraryName.constData() );
 }
 =

 const K4AboutData *Plugin::aboutData() const

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