From 4c6b625f627f69001bc7011bc4c67f09d11ac94c Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Sun, 5 Dec 2010 18:38:36 +0000 Subject: [PATCH] don't ue kio on mobile profile svn path=/trunk/KDE/kdebase/runtime/; revision=1203934 --- scriptengines/javascript/CMakeLists.txt | 7 +++++++ .../javascript/declarative/packageaccessmanager.cpp | 5 +++++ .../javascript/declarative/packageaccessmanager.h | 13 +++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/scriptengines/javascript/CMakeLists.txt b/scriptengines/javascript/CMakeLists.txt index b9ff4408d..27606724d 100644 --- a/scriptengines/javascript/CMakeLists.txt +++ b/scriptengines/javascript/CMakeLists.txt @@ -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 diff --git a/scriptengines/javascript/declarative/packageaccessmanager.cpp b/scriptengines/javascript/declarative/packageaccessmanager.cpp index a3a63af4c..36f9bf482 100644 --- a/scriptengines/javascript/declarative/packageaccessmanager.cpp +++ b/scriptengines/javascript/declarative/packageaccessmanager.cpp @@ -75,6 +75,11 @@ QNetworkReply *PackageAccessManager::createRequest(QNetworkAccessManager::Operat 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 } } diff --git a/scriptengines/javascript/declarative/packageaccessmanager.h b/scriptengines/javascript/declarative/packageaccessmanager.h index 1735a0738..3733e0cb2 100644 --- a/scriptengines/javascript/declarative/packageaccessmanager.h +++ b/scriptengines/javascript/declarative/packageaccessmanager.h @@ -20,8 +20,12 @@ #ifndef PACKAGEACCESSMANAGER_H #define PACKAGEACCESSMANAGER_H -#include +#ifndef PLASMA_NO_KIO +#include +#else +#include +#endif namespace Plasma { @@ -30,7 +34,12 @@ namespace Plasma 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);