Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
a555163e
Kaydet (Commit)
a555163e
authored
Eki 20, 2017
tarafından
Katarina Behrens
Kaydeden (comit)
Thorsten Behrens
Eki 25, 2017
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
kde5: make VCLKDE5Application build again
Change-Id: Ia1f4d1254583d04d1993e9a0ce8ad1f1aaa868d3
üst
05daba4a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
Library_vclplug_kde5.mk
vcl/Library_vclplug_kde5.mk
+1
-0
KDE5XLib.hxx
vcl/unx/kde5/KDE5XLib.hxx
+3
-4
VCLKDE5Application.cxx
vcl/unx/kde5/VCLKDE5Application.cxx
+4
-3
VCLKDE5Application.hxx
vcl/unx/kde5/VCLKDE5Application.hxx
+4
-2
No files found.
vcl/Library_vclplug_kde5.mk
Dosyayı görüntüle @
a555163e
...
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
...
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
vcl/unx/kde5/KDE5SalGraphics \
vcl/unx/kde5/KDE5SalGraphics \
vcl/unx/kde5/KDE5SalInstance \
vcl/unx/kde5/KDE5SalInstance \
vcl/unx/kde5/KDE5XLib \
vcl/unx/kde5/KDE5XLib \
vcl/unx/kde5/VCLKDE5Application \
vcl/unx/kde5/main \
vcl/unx/kde5/main \
))
))
...
...
vcl/unx/kde5/KDE5XLib.hxx
Dosyayı görüntüle @
a555163e
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <memory>
#include <memory>
#include <unx/saldisp.hxx>
#include <unx/saldisp.hxx>
#include <unx/salinst.h>
//#include <fixx11h.h>
//#include <fixx11h.h>
//
//
...
@@ -31,16 +32,14 @@
...
@@ -31,16 +32,14 @@
#include <QtCore/QTimer>
#include <QtCore/QTimer>
#include <QtCore/QAbstractNativeEventFilter>
#include <QtCore/QAbstractNativeEventFilter>
#include <unx/salinst.h>
class
VCLKDE5Application
;
class
VCLKDEApplication
;
class
KDE5XLib
:
public
QObject
,
public
QAbstractNativeEventFilter
,
public
SalXLib
class
KDE5XLib
:
public
QObject
,
public
QAbstractNativeEventFilter
,
public
SalXLib
{
{
Q_OBJECT
Q_OBJECT
private
:
private
:
bool
m_bStartupDone
;
bool
m_bStartupDone
;
std
::
unique_ptr
<
VCLKDEApplication
>
m_pApplication
;
std
::
unique_ptr
<
VCLKDE
5
Application
>
m_pApplication
;
std
::
unique_ptr
<
char
*
[]
>
m_pFreeCmdLineArgs
;
std
::
unique_ptr
<
char
*
[]
>
m_pFreeCmdLineArgs
;
std
::
unique_ptr
<
char
*
[]
>
m_pAppCmdLineArgs
;
std
::
unique_ptr
<
char
*
[]
>
m_pAppCmdLineArgs
;
int
m_nFakeCmdLineArgs
;
int
m_nFakeCmdLineArgs
;
...
...
vcl/unx/kde5/VCLKDE5Application.cxx
Dosyayı görüntüle @
a555163e
...
@@ -24,8 +24,8 @@
...
@@ -24,8 +24,8 @@
#include "KDE5SalDisplay.hxx"
#include "KDE5SalDisplay.hxx"
VCLKDE5Application
::
VCLKDE5Application
()
:
VCLKDE5Application
::
VCLKDE5Application
(
int
argc
,
char
**
argv
)
:
QApplication
()
QApplication
(
argc
,
argv
)
{
{
}
}
...
@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup()
...
@@ -53,7 +53,8 @@ void VCLKDE5Application::postDialogCleanup()
// (such as the auto-extension flag), but that doesn't update KGlobal::config()
// (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,
// (which is probably a KDE bug), so force reading the new configuration,
// otherwise the next opening of the dialog would use the old settings.
// 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
// 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
// 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"),
// doesn't seem to have an equivalent of QClipboard's "useEventLoopWhenWaiting"),
...
...
vcl/unx/kde5/VCLKDE5Application.hxx
Dosyayı görüntüle @
a555163e
...
@@ -24,13 +24,15 @@
...
@@ -24,13 +24,15 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QApplication>
#include <QtCore/QAbstractNativeEventFilter>
#include <QtCore/QAbstractNativeEventFilter>
#include <KConfigCore/kconfig.h>
#undef Region
#undef Region
class
VCLKDEApplication
:
public
QApplication
,
public
QAbstractNativeEventFilter
class
VCLKDE
5
Application
:
public
QApplication
,
public
QAbstractNativeEventFilter
{
{
public
:
public
:
VCLKDE
Application
(
);
VCLKDE
5Application
(
int
argv
,
char
**
argc
);
static
void
preDialogSetup
();
static
void
preDialogSetup
();
static
void
postDialogCleanup
();
static
void
postDialogCleanup
();
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment