diff options
| author | Andrius da Costa Ribas <andriusmao@gmail.com> | 2014-01-01 20:30:44 -0200 |
|---|---|---|
| committer | Andrius da Costa Ribas <andriusmao@gmail.com> | 2014-01-03 21:32:42 -0200 |
| commit | f0480ee767f35ad60f2643f38c4c3fb10cdc9dc7 (patch) | |
| tree | 3f16656064d25f8b5acf5f82c8a047211bf63a5e | |
| parent | Get sure we try downloading just once engine favicon(s)... (diff) | |
| download | rekonq-f0480ee767f35ad60f2643f38c4c3fb10cdc9dc7.tar.xz | |
Fix inconsistent dll linkage - those sources aren't being used for a shared lib.
REVIEW: 114804
| -rw-r--r-- | src/nepomuk/utils/nepomukutils_export.h | 40 | ||||
| -rw-r--r-- | src/nepomuk/utils/resourcemodel.h | 4 | ||||
| -rw-r--r-- | src/nepomuk/utils/simpleresourcemodel.h | 4 |
3 files changed, 2 insertions, 46 deletions
diff --git a/src/nepomuk/utils/nepomukutils_export.h b/src/nepomuk/utils/nepomukutils_export.h deleted file mode 100644 index 718bd7c3..00000000 --- a/src/nepomuk/utils/nepomukutils_export.h +++ /dev/null @@ -1,40 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007 David Faure <faure@kde.org> - Copyright (C) 2010 Sebastian Trueg <trueg@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef NEPOMUKUTILS_EXPORT_H -#define NEPOMUKUTILS_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include <kdemacros.h> - -#ifndef NEPOMUKUTILS_EXPORT -# if defined(KDELIBS_STATIC_LIBS) - /* No export/import for static libraries */ -# define NEPOMUKUTILS_EXPORT -# elif defined(MAKE_NEPOMUKUTILS_LIB) - /* We are building this library */ -# define NEPOMUKUTILS_EXPORT KDE_EXPORT -# else - /* We are using this library */ -# define NEPOMUKUTILS_EXPORT KDE_IMPORT -# endif -#endif - -#endif diff --git a/src/nepomuk/utils/resourcemodel.h b/src/nepomuk/utils/resourcemodel.h index 526c7ac0..5c345848 100644 --- a/src/nepomuk/utils/resourcemodel.h +++ b/src/nepomuk/utils/resourcemodel.h @@ -24,8 +24,6 @@ #include <QtCore/QAbstractItemModel> -#include "nepomukutils_export.h" - namespace Nepomuk2 { class Resource; @@ -54,7 +52,7 @@ namespace Nepomuk2 { * * \since 4.6 */ - class NEPOMUKUTILS_EXPORT ResourceModel : public QAbstractItemModel + class ResourceModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/nepomuk/utils/simpleresourcemodel.h b/src/nepomuk/utils/simpleresourcemodel.h index 2f48d930..c3115e01 100644 --- a/src/nepomuk/utils/simpleresourcemodel.h +++ b/src/nepomuk/utils/simpleresourcemodel.h @@ -24,8 +24,6 @@ #include "resourcemodel.h" -#include "nepomukutils_export.h" - #include <Nepomuk2/Resource> #include <Nepomuk2/Query/Result> @@ -44,7 +42,7 @@ namespace Nepomuk2 { * * \since 4.6 */ - class NEPOMUKUTILS_EXPORT SimpleResourceModel : public ResourceModel + class SimpleResourceModel : public ResourceModel { Q_OBJECT |