From kde-commits  Mon Dec 28 18:02:49 2009
From: Maks Orlovich <maksim () kde ! org>
Date: Mon, 28 Dec 2009 18:02:49 +0000
To: kde-commits
Subject: KDE/kdelibs/kinit
Message-Id: <1262023369.014879.5347.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=126202337820385

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()) {