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

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support/src/kdeui: kde_overrideStyle doesn't need to be exported an
From:       David Faure <faure () kde ! org>
Date:       2013-08-19 14:36:48
Message-ID: E1VBQZc-0007iG-4t () scm ! kde ! org
[Download RAW message or body]

Git commit 7792c0224f934dad263366265009887ac358f7d2 by David Faure.
Committed on 19/08/2013 at 14:33.
Pushed by dfaure into branch 'frameworks'.

kde_overrideStyle doesn't need to be exported anymore

M  +1    -1    staging/kde4support/src/kdeui/kapplication.cpp
M  +1    -2    staging/kde4support/src/kdeui/kglobalsettings.cpp

http://commits.kde.org/kdelibs/7792c0224f934dad263366265009887ac358f7d2

diff --git a/staging/kde4support/src/kdeui/kapplication.cpp \
b/staging/kde4support/src/kdeui/kapplication.cpp index e487211..12092e9 100644
--- a/staging/kde4support/src/kdeui/kapplication.cpp
+++ b/staging/kde4support/src/kdeui/kapplication.cpp
@@ -736,7 +736,7 @@ void KApplicationPrivate::parseCommandLine( )
 
     if (args && args->isSet("style"))
     {
-        extern QString kde_overrideStyle; // see KGlobalSettings. Should we have a \
static setter? +        extern QString kde_overrideStyle; // see KGlobalSettings
         QString reqStyle(args->getOption("style").toLower());
         if (QStyleFactory::keys().contains(reqStyle, Qt::CaseInsensitive))
             kde_overrideStyle = reqStyle;
diff --git a/staging/kde4support/src/kdeui/kglobalsettings.cpp \
b/staging/kde4support/src/kdeui/kglobalsettings.cpp index 3a72b1c..6ee277f 100644
--- a/staging/kde4support/src/kdeui/kglobalsettings.cpp
+++ b/staging/kde4support/src/kdeui/kglobalsettings.cpp
@@ -734,8 +734,7 @@ void KGlobalSettings::Private::_k_slotNotifyChange(int \
changeType, int arg)  }
 
 // Set by KApplication
-#pragma message("FIXME: KWidgets depends on KApplication")
-KDE4SUPPORT_EXPORT QString kde_overrideStyle;
+QString kde_overrideStyle;
 
 void KGlobalSettings::Private::applyGUIStyle()
 {


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