diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 23:05:20 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 23:05:20 +0000 |
| commit | d3e68ec37e6f493f9f6069504149983337a438a2 (patch) | |
| tree | d9e3b5afe00080d66b7d61926c80e4ce96496300 /src/plugins/General | |
| parent | 15771faeecaaf63b21223599e5e9d355bd5f4e9a (diff) | |
| download | qmmp-d3e68ec37e6f493f9f6069504149983337a438a2.tar.gz qmmp-d3e68ec37e6f493f9f6069504149983337a438a2.tar.bz2 qmmp-d3e68ec37e6f493f9f6069504149983337a438a2.zip | |
added Qmmp::dataPath() function
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8582 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/kdenotify/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/General/kdenotify/kdenotify.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/kdenotify/kdenotify.pro | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index 7aa9e20df..173abdda7 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -7,8 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) -SET(libkdenotify_DEFINES APP_NAME_SUFFIX="${APP_NAME_SUFFIX}") - SET(libkdenotify_SRCS kdenotify.cpp kdenotifyfactory.cpp @@ -32,7 +30,6 @@ QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H}) -SET_TARGET_PROPERTIES(kdenotify PROPERTIES COMPILE_DEFINITIONS "${libkdenotify_DEFINES}") add_dependencies(kdenotify libqmmpui) target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS kdenotify DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp index bbd384ff7..782a0dce3 100644 --- a/src/plugins/General/kdenotify/kdenotify.cpp +++ b/src/plugins/General/kdenotify/kdenotify.cpp @@ -60,7 +60,7 @@ KdeNotify::KdeNotify(QObject *parent) : QObject(parent),m_useFreedesktopSpec(fal dir.mkdir("kdenotifycache"); dir.cd("kdenotifycache"); m_coverPath = dir.absolutePath() + "/cover.jpg"; - m_imagesDir = QDir(qApp->applicationDirPath () + "/../share/qmmp" APP_NAME_SUFFIX "/images").absolutePath(); + m_imagesDir = Qmmp::dataPath() + "/images"; QSettings settings(Qmmp::configFile(),QSettings::IniFormat); settings.beginGroup("Kde_Notifier"); diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro index 1e8261633..9dcc165d9 100644 --- a/src/plugins/General/kdenotify/kdenotify.pro +++ b/src/plugins/General/kdenotify/kdenotify.pro @@ -7,8 +7,6 @@ TARGET = $$PLUGINS_PREFIX/General/kdenotify QT += dbus -DEFINES += APP_NAME_SUFFIX=\\\"$$APP_NAME_SUFFIX\\\" - SOURCES += kdenotifyfactory.cpp \ kdenotify.cpp \ settingsdialog.cpp |