Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50027' into 'master'
Use QT_INSTALL_LIBS for install paths. Contributes JB#50027

See merge request mer-core/mkcal!41
  • Loading branch information
Matti Kosola committed Jun 24, 2020
2 parents 0ad6b25 + 9a1f687 commit 39c2c73
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
Expand Up @@ -17,7 +17,7 @@ PKGCONFIG += QmfClient \

QT -= gui

target.path += /${DESTDIR}/usr/lib/mkcalplugins/
target.path += /${DESTDIR}$$[QT_INSTALL_LIBS]/mkcalplugins/

INSTALLS += target

Expand Down
3 changes: 0 additions & 3 deletions rpm/mkcal-qt5.spec
Expand Up @@ -3,7 +3,6 @@ Name: mkcal-qt5
Summary: Extended KDE kcal calendar library port for Maemo
Version: 0.5.20
Release: 1
Group: System/Libraries
License: LGPLv2+
URL: https://github.com/mer-packages/mkcal
Source0: %{name}-%{version}.tar.bz2
Expand All @@ -27,7 +26,6 @@ Extended KDE kcal calendar library port for Maemo

%package devel
Summary: Development files for mkcal
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Expand All @@ -36,7 +34,6 @@ applications using mkcal

%package tests
Summary: Unit tests for mkcal
Group: System/Libraries
BuildRequires: pkgconfig(Qt5Test)
Requires: %{name} = %{version}-%{release}

Expand Down
2 changes: 1 addition & 1 deletion src/servicehandler.cpp
Expand Up @@ -51,7 +51,7 @@ ServiceHandlerPrivate::ServiceHandlerPrivate() : mLoaded(false), mDownloadId(0),

void ServiceHandlerPrivate::loadPlugins()
{
QDir pluginsDir(QLatin1String("/usr/lib/mkcalplugins")); //TODO HARDCODED!!
QDir pluginsDir(QLatin1String(MKCALPLUGINDIR));
qCDebug(lcMkcal) << "LOADING !!!! Plugin directory" << pluginsDir.path();

foreach (const QString &fileName, pluginsDir.entryList(QDir::Files)) {
Expand Down
6 changes: 4 additions & 2 deletions src/src.pro
Expand Up @@ -4,6 +4,8 @@ TARGET = mkcal-qt5

#DEFINES += MKCAL_FOR_MEEGO TIMED_SUPPORT

DEFINES += MKCALPLUGINDIR=\\\"$$[QT_INSTALL_LIBS]/mkcalplugins\\\"

DEFINES += TIMED_SUPPORT

CONFIG += link_pkgconfig create_pc create_prl no_install_prl c++11
Expand All @@ -14,11 +16,11 @@ PKGCONFIG += sqlite3 \
QT += dbus
QT -= gui

target.path = /usr/lib
target.path = $$[QT_INSTALL_LIBS]
headers.path = /usr/include/mkcal-qt5
headers.files += *.h \

pkgconfig.path = /usr/lib/pkgconfig
pkgconfig.path = $$[QT_INSTALL_LIBS]/pkgconfig

INSTALLS += target \
headers \
Expand Down

0 comments on commit 39c2c73

Please sign in to comment.