[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-12-28 18:02:49
Message-ID: 1262023369.014879.5347.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1067016 by orlovich:

Forwardport r1014776

Don't preload libplasma if no hidden visibility; as it loads 
libQtWebKit which has symbol clashes with libkhtml.


 M  +5 -0      kinit.cpp  


--- trunk/KDE/kdelibs/kinit/kinit.cpp #1067015:1067016
@@ -54,6 +54,7 @@
 #include <QtCore/QRegExp>
 #include <QtGui/QFont>
 #include <kcomponentdata.h>
+#include <kdemacros.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
@@ -1731,7 +1732,11 @@
 #ifdef Q_WS_X11
    if (!d.suicide && qgetenv("KDE_IS_PRELINKED").isEmpty())
    {
+#ifdef __KDE_HAVE_GCC_VISIBILITY
        QString extra = KStandardDirs::locate("lib", QLatin1String("libplasma.so.3"), *s_instance);
+#else
+       QString extra;
+#endif
        // can't use KLibLoader here as it would unload the library
        // again
        if (!extra.isEmpty()) {
[prev in list] [next in list] [prev in thread] [next in thread]