diff -Nru kparts-4.97.0/autotests/openorsavequestion_unittest.cpp kparts-4.98.0/autotests/openorsavequestion_unittest.cpp
--- kparts-4.97.0/autotests/openorsavequestion_unittest.cpp	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/autotests/openorsavequestion_unittest.cpp	2014-03-29 07:15:31.000000000 +0000
@@ -23,6 +23,7 @@
 #include <qtest_widgets.h>
 
 #include <kconfiggroup.h>
+#include <ksharedconfig.h>
 #include <QDebug>
 
 #include <QDialog>
diff -Nru kparts-4.97.0/CMakeLists.txt kparts-4.98.0/CMakeLists.txt
--- kparts-4.97.0/CMakeLists.txt	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/CMakeLists.txt	2014-03-29 07:15:31.000000000 +0000
@@ -2,7 +2,7 @@
 
 project(KParts)
 
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 0.0.12 REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
@@ -17,7 +17,7 @@
 
 include(ECMSetupVersion)
 
-set(KF5_VERSION "4.97.0")
+set(KF5_VERSION "4.98.0")
 ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KPARTS
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kparts_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PartsConfigVersion.cmake"
diff -Nru kparts-4.97.0/debian/changelog kparts-4.98.0/debian/changelog
--- kparts-4.97.0/debian/changelog	2014-03-03 15:52:19.000000000 +0000
+++ kparts-4.98.0/debian/changelog	2014-03-29 11:42:31.000000000 +0000
@@ -1,4 +1,10 @@
-kparts (4.97.0-0ubuntu1~ubuntu14.04~ppa3) trusty; urgency=medium
+kparts (4.98.0-0ubuntu1~ubuntu14.04~ppa1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 29 Mar 2014 10:58:50 +0000
+
+kparts (4.97.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream alpha release
   * Rename library package for soname 5
diff -Nru kparts-4.97.0/debian/control kparts-4.98.0/debian/control
--- kparts-4.97.0/debian/control	2014-03-03 15:52:19.000000000 +0000
+++ kparts-4.98.0/debian/control	2014-03-29 11:42:31.000000000 +0000
@@ -5,18 +5,18 @@
 XSBC-Original-Maintainer: Scarlett Clark <scarlett@scarlettgatelyclark.com>
 Build-Depends: debhelper (>= 9.0.0), cmake, pkg-kde-tools,
  extra-cmake-modules (>= 0.0.11), qtbase5-dev, xauth, xvfb,
- libkf5i18n-dev (>= 4.97.0), libkf5kjs-dev (>= 4.97.0),
- libkf5guiaddons-dev (>= 4.97.0), libkf5configwidgets-dev (>= 4.97.0),
- libkf5auth-dev (>= 4.97.0), libkf5coreaddons-dev (>= 4.97.0),
- libkf5codecs-dev (>= 4.97.0), libkf5config-dev (>= 4.97.0),
- libkf5dbusaddons-dev (>= 4.97.0), libkf5service-dev (>= 4.97.0),
- libkf5completion-dev (>= 4.97.0), libkf5windowsystem-dev (>= 4.97.0),
- libkf5itemviews-dev (>= 4.97.0), libkf5widgetsaddons-dev (>= 4.97.0), libkf5iconthemes-dev (>= 4.97.0), libkf5solid-dev (>= 4.97.0),
- libkf5globalaccel-dev (>= 4.97.0), libkf5sonnet-dev (>= 4.97.0),
- libkf5bookmarks-dev (>= 4.97.0), libkf5jobwidgets-dev (>= 4.97.0),
- libkf5xmlgui-dev (>= 4.97.0), libkf5textwidgets-dev (>= 4.97.0),
- libkf5notifications-dev (>= 4.97.0), kf5-kio-dev (>= 4.97.0),
- libkf5attica-dev (>= 4.97.0)
+ libkf5i18n-dev (>= 4.98.0), libkf5kjs-dev (>= 4.98.0),
+ libkf5guiaddons-dev (>= 4.98.0), libkf5configwidgets-dev (>= 4.98.0),
+ libkf5auth-dev (>= 4.98.0), libkf5coreaddons-dev (>= 4.98.0),
+ libkf5codecs-dev (>= 4.98.0), libkf5config-dev (>= 4.98.0),
+ libkf5dbusaddons-dev (>= 4.98.0), libkf5service-dev (>= 4.98.0),
+ libkf5completion-dev (>= 4.98.0), libkf5windowsystem-dev (>= 4.98.0),
+ libkf5itemviews-dev (>= 4.98.0), libkf5widgetsaddons-dev (>= 4.98.0), libkf5iconthemes-dev (>= 4.98.0), libkf5solid-dev (>= 4.98.0),
+ libkf5globalaccel-dev (>= 4.98.0), libkf5sonnet-dev (>= 4.98.0),
+ libkf5bookmarks-dev (>= 4.98.0), libkf5jobwidgets-dev (>= 4.98.0),
+ libkf5xmlgui-dev (>= 4.98.0), libkf5textwidgets-dev (>= 4.98.0),
+ libkf5notifications-dev (>= 4.98.0), kf5-kio-dev (>= 4.98.0),
+ libkf5attica-dev (>= 4.98.0)
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kparts
 
diff -Nru kparts-4.97.0/src/browserextension.cpp kparts-4.98.0/src/browserextension.cpp
--- kparts-4.97.0/src/browserextension.cpp	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/browserextension.cpp	2014-03-29 07:15:31.000000000 +0000
@@ -125,25 +125,15 @@
         BrowserExtensionPrivate::createActionSlotMap();
     }
 
-    // Build list with this extension's slot names.
-    QList<QByteArray> slotNames;
-    int methodCount = metaObject()->methodCount();
-    int methodOffset = metaObject()->methodOffset();
-    for (int i = 0; i < methodCount; ++i) {
-        QMetaMethod method = metaObject()->method(methodOffset + i);
-        if (method.methodType() == QMetaMethod::Slot) {
-            slotNames.append(method.methodSignature());
-        }
-    }
-
     // Set the initial status of the actions depending on whether
     // they're supported or not
+    const QMetaObject *metaobj = metaObject();
     ActionSlotMap::ConstIterator it = s_actionSlotMap()->constBegin();
     ActionSlotMap::ConstIterator itEnd = s_actionSlotMap()->constEnd();
     for (int i = 0; it != itEnd; ++it, ++i) {
         // Does the extension have a slot with the name of this action ?
-        // ######### KDE4 TODO: use QMetaObject::indexOfMethod() #######
-        d->m_actionStatus.setBit(i, slotNames.contains(it.key() + "()"));
+        QByteArray slotSig = it.key() + "()";
+        d->m_actionStatus.setBit(i, metaobj->indexOfMethod(slotSig.constData()) != -1);
     }
 
     connect(d->m_part, SIGNAL(completed()),
diff -Nru kparts-4.97.0/src/browseropenorsavequestion.cpp kparts-4.98.0/src/browseropenorsavequestion.cpp
--- kparts-4.97.0/src/browseropenorsavequestion.cpp	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/browseropenorsavequestion.cpp	2014-03-29 07:15:31.000000000 +0000
@@ -21,6 +21,7 @@
 #include "browseropenorsavequestion.h"
 
 #include <kconfiggroup.h>
+#include <ksharedconfig.h>
 #include <klocalizedstring.h>
 #include <kfileitemactions.h>
 #include <ksqueezedtextlabel.h>
diff -Nru kparts-4.97.0/src/browserrun.cpp kparts-4.98.0/src/browserrun.cpp
--- kparts-4.97.0/src/browserrun.cpp	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/browserrun.cpp	2014-03-29 07:15:31.000000000 +0000
@@ -22,6 +22,7 @@
 #include "browseropenorsavequestion.h"
 
 #include <kconfiggroup.h>
+#include <ksharedconfig.h>
 #include <kmessagebox.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
@@ -513,11 +514,6 @@
 
     newURL.setFragment(cleanedOrigUrl);
     return newURL;
-
-    // The kde3 approach broke with invalid urls, now that they become empty in qt4.
-    //QList<QUrl> lst;
-    //lst << newURL << runURL;
-    //return KUrl::join(lst);
 }
 
 void BrowserRun::redirectToError(int error, const QString &errorText)
diff -Nru kparts-4.97.0/src/mainwindow.h kparts-4.98.0/src/mainwindow.h
--- kparts-4.97.0/src/mainwindow.h	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/mainwindow.h	2014-03-29 07:15:31.000000000 +0000
@@ -81,10 +81,8 @@
     /**
      * Rebuilds the GUI after KEditToolbar changed the toolbar layout.
      * @see configureToolbars()
-     * KDE4: make this virtual. (For now we rely on the fact that it's called
-     * as a slot, so the metaobject finds it here).
      */
-    void saveNewToolbarConfig();
+    void saveNewToolbarConfig() Q_DECL_OVERRIDE;
 
 protected:
     virtual void createShellGUI(bool create = true);
diff -Nru kparts-4.97.0/src/Messages.sh kparts-4.98.0/src/Messages.sh
--- kparts-4.97.0/src/Messages.sh	1970-01-01 00:00:00.000000000 +0000
+++ kparts-4.98.0/src/Messages.sh	2014-03-29 07:15:31.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+    $EXTRACTRC $lst >> rc.cpp
+fi
+
+# If your framework contains tips-of-the-day, call preparetips as well.
+if [ -f "data/tips" ] ; then
+    ( cd data && $PREPARETIPS > ../tips.cpp )
+fi
+
+# Extract strings from all source files.
+# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation
+# system, use $EXTRACT_TR_STRINGS.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kparts5.pot
diff -Nru kparts-4.97.0/src/partmanager.h kparts-4.98.0/src/partmanager.h
--- kparts-4.97.0/src/partmanager.h	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/partmanager.h	2014-03-29 07:15:31.000000000 +0000
@@ -139,9 +139,7 @@
     /**
      * Adds a part to the manager.
      *
-     * Sets it to the active part automatically if @p setActive is true (default ).
-     * Behavior fix in KDE3.4: the part's widget is shown only if setActive is true,
-     * it used to be shown in all cases before.
+     * Sets it to the active part automatically if @p setActive is true (default).
      */
     virtual void addPart(Part *part, bool setActive = true);
 
diff -Nru kparts-4.97.0/src/plugin.cpp kparts-4.98.0/src/plugin.cpp
--- kparts-4.97.0/src/plugin.cpp	2014-03-01 11:51:25.000000000 +0000
+++ kparts-4.98.0/src/plugin.cpp	2014-03-29 07:15:31.000000000 +0000
@@ -27,6 +27,7 @@
 #include <kxmlguifactory.h>
 #include <klocalizedstring.h>
 #include <kdesktopfile.h>
+#include <ksharedconfig.h>
 #include <kconfiggroup.h>
 #include <kaboutdata.h>