KDE/kdebase/workspace/plasma/netbook/shell

[Raphael Kubo da Costa]

SVN commit 1157732 by rkcosta:

Fix build with gcc < 4.3.0.

The issue was brought up on the kde-packager/release-team mailing lists[1], and
it turns out to be a bug in gcc itself related to an iffy part of the c++ spec[2][3].

Thanks a lot to SadEagle (Maksim Orlovich) for helping chase the cause of this bug on IRC.

Will backport to the 4.5 branch.

CCMAIL: plasma-devel at kde.org

[1] http://lists.kde.org/?l=kde-release-team&m=128051849414809&w=2
[2] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36490
[3] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25950


 M  +6 -1      netcorona.cpp  


--- trunk/KDE/kdebase/workspace/plasma/netbook/shell/netcorona.cpp #1157731:1157732
@@ -87,8 +87,13 @@
     QString defaultConfig = KStandardDirs::locate("appdata", "plasma-default-layoutrc");
     if (!defaultConfig.isEmpty()) {
         kDebug() << "attempting to load the default layout from:" << defaultConfig;
-        importLayout(KConfig(defaultConfig));
 
+        // gcc bug 36490: KConfig's copy constructor is private, so passing it as a
+        // temporary to importLayout, ie importLayout(KConfig(defaultConfig)) fails
+        // on gcc < 4.3.0
+        KConfig c(defaultConfig);
+        importLayout(c);
+
         return;
     }
 }