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

List:       kde-commits
Subject:    [kcoreaddons] src/lib: Fix build on Mac
From:       Allen Winter <allen.winter () kdab ! com>
Date:       2014-05-14 21:10:30
Message-ID: E1WkgRa-0005JD-9A () scm ! kde ! org
[Download RAW message or body]

Git commit baa60ba38dce02d5b89d6b19306cfee3c03fa805 by Allen Winter.
Committed on 14/05/2014 at 21:09.
Pushed by winterz into branch 'master'.

Fix build on Mac

BSD is a builtin of some sort, so use BSDL instead

M  +3    -3    src/lib/kaboutdata.cpp
M  +1    -1    src/lib/kaboutdata.h

http://commits.kde.org/kcoreaddons/baa60ba38dce02d5b89d6b19306cfee3c03fa805

diff --git a/src/lib/kaboutdata.cpp b/src/lib/kaboutdata.cpp
index 30518c0..8a51ec1 100644
--- a/src/lib/kaboutdata.cpp
+++ b/src/lib/kaboutdata.cpp
@@ -196,7 +196,7 @@ QString KAboutLicense::text() const
         knownLicense = true;
         pathToFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QString::fromLatin1("LICENSES/LGPL_V2"));  break;
-    case KAboutLicense::BSD:
+    case KAboutLicense::BSDL:
         knownLicense = true;
         pathToFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QString::fromLatin1("LICENSES/BSD"));  break;
@@ -264,7 +264,7 @@ QString KAboutLicense::name(KAboutLicense::NameFormat formatName) \
                const
         licenseShort = QCoreApplication::translate("KAboutLicense", "LGPL v2", \
                "@item license (short name)");
         licenseFull = QCoreApplication::translate("KAboutLicense", "GNU Lesser \
General Public License Version 2", "@item license");  break;
-    case KAboutLicense::BSD:
+    case KAboutLicense::BSDL:
         licenseShort = QCoreApplication::translate("KAboutLicense", "BSD License", \
                "@item license (short name)");
         licenseFull = QCoreApplication::translate("KAboutLicense", "BSD License", \
"@item license");  break;
@@ -323,7 +323,7 @@ KAboutLicense KAboutLicense::byKeyword(const QString &rawKeyword)
         ldict.insert("lgpl", KAboutLicense::LGPL);
         ldict.insert("lgplv2", KAboutLicense::LGPL_V2);
         ldict.insert("lgplv2+", KAboutLicense::LGPL_V2);
-        ldict.insert("bsd", KAboutLicense::BSD);
+        ldict.insert("bsd", KAboutLicense::BSDL);
         ldict.insert("artistic", KAboutLicense::Artistic);
         ldict.insert("qpl", KAboutLicense::QPL);
         ldict.insert("qplv1", KAboutLicense::QPL_V1_0);
diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h
index a2a2fe3..f0f3e12 100644
--- a/src/lib/kaboutdata.h
+++ b/src/lib/kaboutdata.h
@@ -169,7 +169,7 @@ public:
         GPL_V2 = 1,
         LGPL = 2,
         LGPL_V2 = 2,
-        BSD  = 3,
+        BSDL = 3,
         Artistic = 4,
         QPL = 5,
         QPL_V1_0 = 5,


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