Kaydet (Commit) a555163e authored tarafından Katarina Behrens's avatar Katarina Behrens Kaydeden (comit) Thorsten Behrens

kde5: make VCLKDE5Application build again

Change-Id: Ia1f4d1254583d04d1993e9a0ce8ad1f1aaa868d3
üst 05daba4a
......@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
vcl/unx/kde5/KDE5SalGraphics \
vcl/unx/kde5/KDE5SalInstance \
vcl/unx/kde5/KDE5XLib \
vcl/unx/kde5/VCLKDE5Application \
vcl/unx/kde5/main \
))
......
......@@ -22,6 +22,7 @@
#include <memory>
#include <unx/saldisp.hxx>
#include <unx/salinst.h>
//#include <fixx11h.h>
//
......@@ -31,16 +32,14 @@
#include <QtCore/QTimer>
#include <QtCore/QAbstractNativeEventFilter>
#include <unx/salinst.h>
class VCLKDEApplication;
class VCLKDE5Application;
class KDE5XLib : public QObject, public QAbstractNativeEventFilter, public SalXLib
{
Q_OBJECT
private:
bool m_bStartupDone;
std::unique_ptr<VCLKDEApplication> m_pApplication;
std::unique_ptr<VCLKDE5Application> m_pApplication;
std::unique_ptr<char*[]> m_pFreeCmdLineArgs;
std::unique_ptr<char*[]> m_pAppCmdLineArgs;
int m_nFakeCmdLineArgs;
......
......@@ -24,8 +24,8 @@
#include "KDE5SalDisplay.hxx"
VCLKDE5Application::VCLKDE5Application() :
QApplication()
VCLKDE5Application::VCLKDE5Application( int argc, char** argv) :
QApplication( argc, argv)
{
}
......@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup()
// (such as the auto-extension flag), but that doesn't update KGlobal::config()
// (which is probably a KDE bug), so force reading the new configuration,
// otherwise the next opening of the dialog would use the old settings.
KGlobal::config()->reparseConfiguration();
KConfig config;
config.reparseConfiguration();
// HACK: If Qt owns clipboard or selection, give up on their ownership now. Otherwise
// LO core might ask for the contents, but it would block while doing so (i.e. it
// doesn't seem to have an equivalent of QClipboard's "useEventLoopWhenWaiting"),
......
......@@ -24,13 +24,15 @@
#include <QtWidgets/QApplication>
#include <QtCore/QAbstractNativeEventFilter>
#include <KConfigCore/kconfig.h>
#undef Region
class VCLKDEApplication : public QApplication, public QAbstractNativeEventFilter
class VCLKDE5Application : public QApplication, public QAbstractNativeEventFilter
{
public:
VCLKDEApplication();
VCLKDE5Application( int argv, char** argc);
static void preDialogSetup();
static void postDialogCleanup();
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment