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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkio-upnp-ms=5D_/=3A_Merge_branch_=27master=27_into_?=
From:       Nikhil Marathe <nsm.nikhil () gmail ! com>
Date:       2011-06-04 16:08:39
Message-ID: 20110604160839.3DE9EA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 2b9872cc61405d0e3e09450de90b033b87b38a87 by Nikhil Marathe.
Committed on 31/05/2011 at 16:32.
Pushed by nikhilm into branch 'master'.

Merge branch 'master' into codeOptimization

Conflicts:
	controlpointthread.cpp

MM +4    -3    CMakeLists.txt     
I  +5    -2    ChangeLog     
I  +32   -0    FindHUpnp.cmake     
MM +2    -4    controlpointthread.cpp     
I  +0    -1    kio_upnp_ms.protocol     
I  +1    -1    persistentaction.cpp     
I  +1    -1    tests/recursive_upnp.cpp     
I  +1    -1    tests/stattest.cpp     
I  +1    -1    tests/upnpmstest.cpp     
I  +116  -0    upnp-ms-types.h     
I  +0    -116  upnptypes.h     

http://commits.kde.org/kio-upnp-ms/2b9872cc61405d0e3e09450de90b033b87b38a87

diff --cc CMakeLists.txt
index 69934f3,e36ddf3..2fab819
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,12 -1,10 +1,13 @@@
  PROJECT( kio_upnp_ms )
 +
 +set( CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} \
${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )  +
  FIND_PACKAGE(KDE4 REQUIRED)
- set(KIO_UPNP_MS_MAJOR_VERSION "0")
- set(KIO_UPNP_MS_MINOR_VERSION "8")
+ set(KIO_UPNP_MS_MAJOR_VERSION "1")
+ set(KIO_UPNP_MS_MINOR_VERSION "0")
  set(KIO_UPNP_MS_PATCH_VERSION "0")
  
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
  find_package(HUpnp REQUIRED)
  
  if ( HUPNP_FOUND AND ((HUPNP_VERSION_MAJOR EQUAL 0 AND HUPNP_VERSION_MINOR EQUAL 9) \
                OR (HUPNP_VERSION_MAJOR EQUAL 1)))
diff --cc controlpointthread.cpp
index ed9be7d,a6412dd..b98882c
--- a/controlpointthread.cpp
+++ b/controlpointthread.cpp
@@@ -371,8 -370,7 +371,7 @@@ void ControlPointThread::createStatResu
          return;
      }
  
 -    QString didlString = output["Result"].value().toString();
 +    QString didlString = output[QLatin1String("Result")].value().toString();
-     kDebug() << "STAT" << didlString;
      DIDL::Parser parser;
      connect( &parser, SIGNAL(error( const QString& )), this, SLOT(slotParseError( \
                const QString& )) );
      connect( &parser, SIGNAL(containerParsed(DIDL::Container *)), this, \
SLOT(slotListContainer(DIDL::Container *)) );


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