Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: fix build against katie

Browse source
This commit is contained in:
Ivailo Monev 2015-08-23 05:30:32 +03:00
parent b99f64d8a6
commit 06bb32bd92
15 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kdeui/fonts/kfontcombobox.cpp
View file

@ -35,6 +35,7 @@
#include <QAbstractItemDelegate> #include <QAbstractItemDelegate>
#include <QStringListModel> #include <QStringListModel>
#include <QPainter> #include <QPainter>
#include <QPen>
#include <QList> #include <QList>
#include <QHash> #include <QHash>
#include <QScrollBar> #include <QScrollBar>

1
kdeui/kernel/kstyle.cpp
View file

@ -60,6 +60,7 @@
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QScrollBar> #include <QtGui/QScrollBar>
#include <QtGui/QStyleOption> #include <QtGui/QStyleOption>
#include <QtGui/qpen.h>
#include <kcomponentdata.h> #include <kcomponentdata.h>
#include <kglobal.h> #include <kglobal.h>

1
kdeui/widgets/kled.cpp
View file

@ -23,6 +23,7 @@
#include <kcolorutils.h> #include <kcolorutils.h>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QPen>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QStyle> #include <QtGui/QStyle>
#include <QtGui/QStyleOption> #include <QtGui/QStyleOption>

1
kdeui/widgets/kselector.cpp
View file

@ -21,6 +21,7 @@
#include <QImage> #include <QImage>
#include <QPainter> #include <QPainter>
#include <QtGui/qpen.h>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QPixmap> #include <QPixmap>
#include <QStyle> #include <QStyle>

1
kdeui/widgets/kxyselector.cpp
View file

@ -20,6 +20,7 @@
#include "kxyselector.h" #include "kxyselector.h"
#include <QStyle> #include <QStyle>
#include <QPainter> #include <QPainter>
#include <QtGui/qpen.h>
#include <QtGui/qstyleoption.h> #include <QtGui/qstyleoption.h>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <kdebug.h> #include <kdebug.h>

2
kdewebkit/kwebkitpart/src/kwebkitpart.cpp
View file

@ -63,7 +63,7 @@
#include <QDBusInterface> #include <QDBusInterface>
#include <QWebFrame> #include <QWebFrame>
#include <QWebElement> #include <QWebElement>
#include <QWebHistoryItem> #include <QWebHistory>
#define QL1S(x) QLatin1String(x) #define QL1S(x) QLatin1String(x)
#define QL1C(x) QLatin1Char(x) #define QL1C(x) QLatin1Char(x)

1
kdewebkit/kwebkitpart/src/kwebkitpart_ext.cpp
View file

@ -55,7 +55,6 @@
#include <QWebFrame> #include <QWebFrame>
#include <QWebHistory> #include <QWebHistory>
#include <QWebElement> #include <QWebElement>
#include <QWebElementCollection>
#define QL1S(x) QLatin1String(x) #define QL1S(x) QLatin1String(x)
#define QL1C(x) QLatin1Char(x) #define QL1C(x) QLatin1Char(x)

2
kdewebkit/kwebkitpart/src/networkaccessmanager.cpp
View file

@ -30,7 +30,7 @@
#include <QWidget> #include <QWidget>
#include <QNetworkReply> #include <QNetworkReply>
#include <QWebFrame> #include <QWebFrame>
#include <QWebElementCollection> #include <QWebElement>
#define QL1S(x) QLatin1String(x) #define QL1S(x) QLatin1String(x)

1
kdewebkit/kwebkitpart/src/webpage.cpp
View file

@ -55,7 +55,6 @@
#include <QWebFrame> #include <QWebFrame>
#include <QWebElement> #include <QWebElement>
#include <QWebHistory> #include <QWebHistory>
#include <QWebHistoryItem>
#include <QWebSecurityOrigin> #include <QWebSecurityOrigin>
#define QL1S(x) QLatin1String(x) #define QL1S(x) QLatin1String(x)

13
kdewebkit/kwebkitpart/src/webview.cpp
View file

@ -47,8 +47,9 @@
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QWebFrame> #include <QWebFrame>
#include <QWebElement> #include <QWebElement>
#include <QWebHitTestResult> #ifndef QT_KATIE
#include <QWebInspector> #include <QWebInspector>
#endif
#include <QToolTip> #include <QToolTip>
#include <QCoreApplication> #include <QCoreApplication>
#include <unistd.h> #include <unistd.h>
@ -63,7 +64,9 @@ WebView::WebView(KWebKitPart* part, QWidget* parent)
:KWebView(parent, false), :KWebView(parent, false),
m_actionCollection(new KActionCollection(this)), m_actionCollection(new KActionCollection(this)),
m_part(part), m_part(part),
#ifndef QT_KATIE
m_webInspector(0), m_webInspector(0),
#endif
m_autoScrollTimerId(-1), m_autoScrollTimerId(-1),
m_verticalAutoScrollSpeed(0), m_verticalAutoScrollSpeed(0),
m_horizontalAutoScrollSpeed(0), m_horizontalAutoScrollSpeed(0),
@ -484,6 +487,7 @@ void WebView::editableContentActionPopupMenu(KParts::BrowserExtension::ActionGro
editableContentActions.append(action); editableContentActions.append(action);
} }
#ifndef QT_KATIE
if (settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) { if (settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) {
if (!m_webInspector) { if (!m_webInspector) {
m_webInspector = new QWebInspector; m_webInspector = new QWebInspector;
@ -495,6 +499,7 @@ void WebView::editableContentActionPopupMenu(KParts::BrowserExtension::ActionGro
editableContentActions.append(action); editableContentActions.append(action);
editableContentActions.append(pageAction(QWebPage::InspectElement)); editableContentActions.append(pageAction(QWebPage::InspectElement));
} }
#endif
partGroupMap.insert("editactions" , editableContentActions); partGroupMap.insert("editactions" , editableContentActions);
} }
@ -610,7 +615,11 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
const bool showDocSourceAction = (!m_result.linkUrl().isValid() && const bool showDocSourceAction = (!m_result.linkUrl().isValid() &&
!m_result.imageUrl().isValid() && !m_result.imageUrl().isValid() &&
!m_result.isContentSelected()); !m_result.isContentSelected());
#ifndef QT_KATIE
const bool showInspectorAction = settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled); const bool showInspectorAction = settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled);
#else
const bool showInspectorAction = false;
#endif
if (showDocSourceAction || showInspectorAction) { if (showDocSourceAction || showInspectorAction) {
KAction *separatorAction = new KAction(m_actionCollection); KAction *separatorAction = new KAction(m_actionCollection);
@ -621,6 +630,7 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
if (showDocSourceAction) if (showDocSourceAction)
partActions.append(m_part->actionCollection()->action("viewDocumentSource")); partActions.append(m_part->actionCollection()->action("viewDocumentSource"));
#ifndef QT_KATIE
if (showInspectorAction) { if (showInspectorAction) {
if (!m_webInspector) { if (!m_webInspector) {
m_webInspector = new QWebInspector; m_webInspector = new QWebInspector;
@ -634,6 +644,7 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
m_webInspector = 0; m_webInspector = 0;
} }
} }
#endif
partGroupMap.insert("partactions", partActions); partGroupMap.insert("partactions", partActions);
} }

6
kdewebkit/kwebkitpart/src/webview.h
View file

@ -26,12 +26,14 @@
#include <kparts/browserextension.h> #include <kparts/browserextension.h>
#include <kwebview.h> #include <kwebview.h>
#include <QWebHitTestResult> #include <QWebFrame>
class KUrl; class KUrl;
class KWebKitPart; class KWebKitPart;
class QWebHitTestResult; class QWebHitTestResult;
#ifndef QT_KATIE
class QWebInspector; class QWebInspector;
#endif
class QLabel; class QLabel;
class WebView : public KWebView class WebView : public KWebView
@ -130,7 +132,9 @@ private:
KActionCollection* m_actionCollection; KActionCollection* m_actionCollection;
QWebHitTestResult m_result; QWebHitTestResult m_result;
QPointer<KWebKitPart> m_part; QPointer<KWebKitPart> m_part;
#ifndef QT_KATIE
QWebInspector* m_webInspector; QWebInspector* m_webInspector;
#endif
qint32 m_autoScrollTimerId; qint32 m_autoScrollTimerId;
qint32 m_verticalAutoScrollSpeed; qint32 m_verticalAutoScrollSpeed;

2
kdewebkit/kwebpage.cpp
View file

@ -254,7 +254,9 @@ KWebPage::KWebPage(QObject *parent, Integration flags)
setActionIcon(action(Undo), KIcon("edit-undo")); setActionIcon(action(Undo), KIcon("edit-undo"));
setActionIcon(action(Redo), KIcon("edit-redo")); setActionIcon(action(Redo), KIcon("edit-redo"));
setActionIcon(action(SelectAll), KIcon("edit-select-all")); setActionIcon(action(SelectAll), KIcon("edit-select-all"));
#ifndef QT_KATIE
setActionIcon(action(InspectElement), KIcon("view-process-all")); setActionIcon(action(InspectElement), KIcon("view-process-all"));
#endif
setActionIcon(action(OpenLinkInNewWindow), KIcon("window-new")); setActionIcon(action(OpenLinkInNewWindow), KIcon("window-new"));
setActionIcon(action(OpenFrameInNewWindow), KIcon("window-new")); setActionIcon(action(OpenFrameInNewWindow), KIcon("window-new"));
setActionIcon(action(OpenImageInNewWindow), KIcon("window-new")); setActionIcon(action(OpenImageInNewWindow), KIcon("window-new"));

1
kdewebkit/kwebwallet.cpp
View file

@ -33,7 +33,6 @@
#include <QtWebKit/QWebPage> #include <QtWebKit/QWebPage>
#include <QtWebKit/QWebFrame> #include <QtWebKit/QWebFrame>
#include <QtWebKit/QWebElement> #include <QtWebKit/QWebElement>
#include <QtWebKit/QWebElementCollection>
#include <qwindowdefs.h> #include <qwindowdefs.h>
#define QL1S(x) QLatin1String(x) #define QL1S(x) QLatin1String(x)

1
kio/kssl/ksslcertificate.cpp
View file

@ -749,6 +749,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
// end of checking code // end of checking code
// //
Q_UNUSED(rc);
//kDebug(7029) << "KSSL Validation procedure RC: " //kDebug(7029) << "KSSL Validation procedure RC: "
// << rc << endl; // << rc << endl;
//kDebug(7029) << "KSSL Validation procedure errcode: " //kDebug(7029) << "KSSL Validation procedure errcode: "

2
solid/solid/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_subdirectory( ifaces ) add_subdirectory( ifaces )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${QT_QTDBUS_INCLUDE_DIR} ) include_directories( ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
configure_file(solid_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h) configure_file(solid_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h)