diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/main.cpp | 3 | ||||
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 8 |
4 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a4aa1eda5..6a4c49bcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8.12) project(Dolphin) -set(DOLPHIN_VERSION "14.12.95") +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "15") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") set(KF5_MIN_VERSION "5.7.0") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 498e7c596..2a5e5a688 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -168,7 +168,7 @@ set_target_properties(dolphinprivate PROPERTIES SOVERSION ${DOLPHINPRIVATE_SOVERSION} ) -install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) ########################################## diff --git a/src/main.cpp b/src/main.cpp index ec6833681..b4ca2c6af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include "dolphin_version.h" #include "dolphinmainwindow.h" #include "dolphin_generalsettings.h" #include "dbusinterface.h" @@ -44,7 +45,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc")); migrate.migrate(); - KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95", + KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING), i18nc("@title", "File Manager"), KAboutLicense::GPL, i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index f3d344963..013b99731 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -101,8 +101,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : connect(m_bookmarkManager, &KBookmarkManager::changed, m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start)); - connect(m_bookmarkManager, &KBookmarkManager::bookmarksChanged, - m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start)); } PlacesItemModel::~PlacesItemModel() @@ -917,16 +915,16 @@ void PlacesItemModel::createSystemBookmarks() "view-calendar-month", I18N_NOOP2("KFile System Bookmarks", "Last Month"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/documents"), - "folder-txt", + "folder-text", I18N_NOOP2("KFile System Bookmarks", "Documents"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/images"), - "folder-image", + "folder-images", I18N_NOOP2("KFile System Bookmarks", "Images"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/audio"), "folder-sound", I18N_NOOP2("KFile System Bookmarks", "Audio Files"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/videos"), - "folder-video", + "folder-videos", I18N_NOOP2("KFile System Bookmarks", "Videos"))); } |