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

List:       kde-commits
Subject:    [libkdepim] src/libkdepimakonadi/addressline/plugins: Merge remote-tracking branch 'origin/Applicati
From:       Montel Laurent <null () kde ! org>
Date:       2017-08-01 11:54:23
Message-ID: E1dcVkl-0003jT-49 () code ! kde ! org
[Download RAW message or body]

Git commit bafa55dc01bb2445535ef50ba4d2fe2f20a67e80 by Montel Laurent.
Committed on 01/08/2017 at 11:54.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/Applications/17.08'

M  +3    -3    src/libkdepimakonadi/addressline/plugins/addressesslineedita=
bstractplugin.h

https://commits.kde.org/libkdepim/bafa55dc01bb2445535ef50ba4d2fe2f20a67e80

diff --cc src/libkdepimakonadi/addressline/plugins/addressesslineeditabstra=
ctplugin.h
index 83de28c,41fce5c..7c1c6c4
--- a/src/libkdepimakonadi/addressline/plugins/addressesslineeditabstractpl=
ugin.h
+++ b/src/libkdepimakonadi/addressline/plugins/addressesslineeditabstractpl=
ugin.h
@@@ -21,18 -21,10 +21,18 @@@
  #define ADDRESSESSLINEEDITABSTRACTPLUGIN_H
  =

  #include <QObject>
- #include "kdepim_export.h"
+ #include "kdepimakonadi_export.h"
  =

  namespace KPIM {
 +class AddresseeLineEdit;
- struct KDEPIM_EXPORT AddressessLineEditAbstractPluginInfo
++struct KDEPIMAKONADI_EXPORT AddressessLineEditAbstractPluginInfo
 +{
 +    QString name;
 +    QString identifier;
 +    QString description;
 +};
 +
- class KDEPIM_EXPORT AddressessLineEditAbstractPlugin : public QObject
+ class KDEPIMAKONADI_EXPORT AddressessLineEditAbstractPlugin : public QObj=
ect
  {
      Q_OBJECT
  public:
[prev in list] [next in list] [prev in thread] [next in thread]