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

List:       kde-commits
Subject:    KDE/kdebase/runtime/plasma/scriptengines/javascript
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-12-05 18:38:37
Message-ID: 20101205183837.40CD6AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203934 by mart:

don't ue kio on mobile profile


 M  +7 -0      CMakeLists.txt  
 M  +5 -0      declarative/packageaccessmanager.cpp  
 M  +11 -2     declarative/packageaccessmanager.h  


--- trunk/KDE/kdebase/runtime/plasma/scriptengines/javascript/CMakeLists.txt \
#1203933:1203934 @@ -1,5 +1,12 @@
 # APPLET
 
+if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+    set(PLASMA_NO_KDEWEBKIT TRUE)
+    set(PLASMA_NO_KNEWSTUFF TRUE)
+    set(PLASMA_NO_SOLID TRUE)
+    set(PLASMA_NO_KIO TRUE)
+endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+
 set(simple_javascript_engine_SRCS
     common/javascriptaddonpackagestructure.cpp
     common/jsscriptenv.cpp
--- trunk/KDE/kdebase/runtime/plasma/scriptengines/javascript/declarative/packageaccessmanager.cpp \
#1203933:1203934 @@ -75,6 +75,11 @@
         return new ErrorReply(op, req);
     } else {
         return KIO::AccessManager::createRequest(op, req, outgoingData);
+        #ifndef PLASMA_NO_KIO
+            return KIO::AccessManager::createRequest(op, req, outgoingData);
+        #else
+            return QNetworkAccessManager::createRequest(op, req, outgoingData);
+        #endif
     }
 }
 
--- trunk/KDE/kdebase/runtime/plasma/scriptengines/javascript/declarative/packageaccessmanager.h \
#1203933:1203934 @@ -20,9 +20,13 @@
 #ifndef PACKAGEACCESSMANAGER_H
 #define PACKAGEACCESSMANAGER_H
 
+
+#ifndef PLASMA_NO_KIO
 #include <kio/accessmanager.h>
+#else
+#include <QtNetwork/QNetworkAccessManager>
+#endif
 
-
 namespace Plasma
 {
     class Package;
@@ -30,7 +34,12 @@
 
 class AppletAuthorization;
 
-class PackageAccessManager : public KIO::AccessManager
+class PackageAccessManager :
+#ifdef PLASMA_NO_KIO
+public QNetworkAccessManager
+#else
+public KIO::AccessManager
+#endif
 {
 public:
     PackageAccessManager(const Plasma::Package *package, AppletAuthorization *auth, \
QObject *parent = 0);


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