Commit 656cc163 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Initialize kcrash, so we'll get DrKonqui back (hopefully)

parent 25fd3710
......@@ -245,8 +245,8 @@ macro_ensure_out_of_source_build("Compiling Calligra inside the source directory
find_package(KF5KIO ${MIN_FRAMEWORKS_VERSION})
macro_bool_to_01(KF5KIO_FOUND HAVE_KIO)
find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION})
macro_bool_to_01(KF5Crash_FOUND HAVE_CRASH)
find_package(KF5Crash ${MIN_FRAMEWORKS_VERSION})
macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH)
find_package(X11)
if(X11_FOUND)
......
......@@ -55,6 +55,9 @@
/* Defines if DBUS is present */
#cmakedefine HAVE_DBUS 1
/* Defines if KCrash is present */
#cmakedefine HAVE_KCRASH 1
/* This file contains all the paths that change when changing the installation prefix */
#define CALLIGRAPREFIX "${CMAKE_INSTALL_PREFIX}"
......@@ -174,6 +174,11 @@ target_link_libraries(krita
Qt5::PrintSupport
Qt5::Svg
Qt5::Concurrent)
if(HAVE_KCRASH)
target_link_libraries(krita
KF5::Crash
)
endif()
if (APPLE)
set(CMAKE_MACOSX_RPATH ON)
......
......@@ -50,6 +50,9 @@
#include <ui/input/wintab/kis_tablet_support_x11.h>
#endif
#if defined HAVE_KCRASH
#include <kcrash.h>
#endif
extern "C" int main(int argc, char **argv)
{
bool runningInKDE = !qgetenv("KDE_FULL_SESSION").isEmpty();
......@@ -78,7 +81,9 @@ extern "C" int main(int argc, char **argv)
QString key = "Krita3" +
QDesktopServices::storageLocation(QDesktopServices::HomeLocation).replace("/", "_");
key = key.replace(":", "_").replace("\\","_");
#if defined HAVE_KCRASH
KCrash::initialize();
#endif
#if defined HAVE_X11
// we need to call XInitThreads() (which this does) because of gmic (and possibly others)
// do their own X11 stuff in their own threads
......
......@@ -90,7 +90,7 @@ KisImportExportFilter::ConversionStatus KisPNGExport::convert(const QByteArray&
KoDialog* kdb = new KoDialog(0);
kdb->setCaption(i18n("PNG Export Options"));
kdb->setModal(false);
kdb->setButtons(KDialog::Ok | KDialog::Cancel);
kdb->setButtons(KoDialog::Ok | KoDialog::Cancel);
KisImageWSP image = input->image();
qApp->processEvents(); // For vector layers to be updated
......
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