Commit 081f1b9f authored by Thomas Zander's avatar Thomas Zander

Move the setting of the image dir to the app to avoid race conditions and erros when

we use the globals before we use the app.

svn path=/trunk/koffice/; revision=619573
parent 30555b5c
......@@ -34,6 +34,7 @@
#include <kdesktopfile.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <stdlib.h>
void qt_generate_epsf( bool b );
......@@ -62,6 +63,9 @@ KoApplication::KoApplication()
{
d = new KoApplicationPrivate;
// Tell the iconloader about share/apps/koffice/icons
kapp->iconLoader()->addAppDir("koffice");
// Initialize all KOffice directories etc.
KoGlobal::initialize();
......
......@@ -37,7 +37,6 @@
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
#include <kimageio.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
......@@ -60,9 +59,6 @@ KoGlobal::KoGlobal()
// Tell KStandardDirs about the koffice prefix
KGlobal::dirs()->addPrefix(PREFIX);
// Tell the iconloader about share/apps/koffice/icons
kapp->iconLoader()->addAppDir("koffice");
// Another way to get the DPI of the display would be QPaintDeviceMetrics,
// but we have no widget here (and moving this to KoView wouldn't allow
// using this from the document easily).
......
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