[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-scripting-rempt] krita/plugins/extensions/pykrita/libkis: fix compilation (the huge
From: Cyrille Berger <cberger () cberger ! net>
Date: 2015-08-25 18:29:23
Message-ID: E1ZUIyJ-0005x0-Hj () scm ! kde ! org
[Download RAW message or body]
Git commit 8cf042bf0791df151288bed188229e49f666d0fc by Cyrille Berger.
Committed on 25/08/2015 at 18:29.
Pushed by berger into branch 'krita-scripting-rempt'.
fix compilation (the huge krita_export header has been split up)
M +1 -1 krita/plugins/extensions/pykrita/libkis/application.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/dockwidget.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/dockwidgetfactorybas=
e.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/document.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/image.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/krita.h
A +59 -0 krita/plugins/extensions/pykrita/libkis/libkis_export.h =
[License: LGPL (v2+)]
M +1 -1 krita/plugins/extensions/pykrita/libkis/mainwindow.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/node.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/view.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/viewextension.h
M +1 -1 krita/plugins/extensions/pykrita/libkis/viewmanager.h
http://commits.kde.org/calligra/8cf042bf0791df151288bed188229e49f666d0fc
diff --git a/krita/plugins/extensions/pykrita/libkis/application.h b/krita/=
plugins/extensions/pykrita/libkis/application.h
index f503e46..9c0bb68 100644
--- a/krita/plugins/extensions/pykrita/libkis/application.h
+++ b/krita/plugins/extensions/pykrita/libkis/application.h
@@ -19,7 +19,7 @@
#define LIBKIS_APPLICATION_H
=
#include <QObject>
-#include <krita_export.h>
+#include "libkis_export.h"
class LIBKIS_EXPORT Application : public QObject
{
Q_OBJECT
diff --git a/krita/plugins/extensions/pykrita/libkis/dockwidget.h b/krita/p=
lugins/extensions/pykrita/libkis/dockwidget.h
index 5425282..94b4adf 100644
--- a/krita/plugins/extensions/pykrita/libkis/dockwidget.h
+++ b/krita/plugins/extensions/pykrita/libkis/dockwidget.h
@@ -22,7 +22,7 @@
#include <QDockWidget>
#include <KoCanvasObserverBase.h>
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class LIBKIS_EXPORT DockWidget : public QDockWidget, public KoCanvasObserv=
erBase {
Q_OBJECT
diff --git a/krita/plugins/extensions/pykrita/libkis/dockwidgetfactorybase.=
h b/krita/plugins/extensions/pykrita/libkis/dockwidgetfactorybase.h
index 6478d2f..546ef44 100644
--- a/krita/plugins/extensions/pykrita/libkis/dockwidgetfactorybase.h
+++ b/krita/plugins/extensions/pykrita/libkis/dockwidgetfactorybase.h
@@ -22,7 +22,7 @@
#include <QString>
#include <KoDockFactoryBase.h>
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class LIBKIS_EXPORT DockWidgetFactoryBase : public KoDockFactoryBase
{
diff --git a/krita/plugins/extensions/pykrita/libkis/document.h b/krita/plu=
gins/extensions/pykrita/libkis/document.h
index c506a58..52f3d82 100644
--- a/krita/plugins/extensions/pykrita/libkis/document.h
+++ b/krita/plugins/extensions/pykrita/libkis/document.h
@@ -18,7 +18,7 @@
#ifndef LIBKIS_DOCUMENT_H
#define LIBKIS_DOCUMENT_H
=
-#include <krita_export.h>
+#include "libkis_export.h"
#include <QPointer>
=
class KisDocument;
diff --git a/krita/plugins/extensions/pykrita/libkis/image.h b/krita/plugin=
s/extensions/pykrita/libkis/image.h
index 88bbe6e..35f75b5 100644
--- a/krita/plugins/extensions/pykrita/libkis/image.h
+++ b/krita/plugins/extensions/pykrita/libkis/image.h
@@ -20,7 +20,7 @@
=
#include <QObject>
#include <kis_image.h>
-#include <krita_export.h>
+#include "libkis_export.h"
=
class LIBKIS_EXPORT Image : public QObject
{
diff --git a/krita/plugins/extensions/pykrita/libkis/krita.h b/krita/plugin=
s/extensions/pykrita/libkis/krita.h
index 7eff2d6..5bdc292 100644
--- a/krita/plugins/extensions/pykrita/libkis/krita.h
+++ b/krita/plugins/extensions/pykrita/libkis/krita.h
@@ -28,7 +28,7 @@
#include "document.h"
#include "image.h"
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class DockWidgetFactoryBase;
class ViewExtension;
diff --git a/krita/plugins/extensions/pykrita/libkis/libkis_export.h b/krit=
a/plugins/extensions/pykrita/libkis/libkis_export.h
new file mode 100644
index 0000000..e319507
--- /dev/null
+++ b/krita/plugins/extensions/pykrita/libkis/libkis_export.h
@@ -0,0 +1,59 @@
+/*
+ This file is part of krita
+ Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
+ Copyright (c) 2008 Thomas Zander <zander@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 Lice=
nse
+ 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 LIBKIS_EXPORT_H
+#define LIBKIS_EXPORT_H
+
+#include <kdemacros.h>
+
+/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be use=
d from C files too */
+#if defined(_WIN32) || defined(_WIN64)
+
+#ifndef LIBKIS_EXPORT
+# ifdef MAKE_LIBKIS_LIB
+# define LIBKIS_EXPORT KDE_EXPORT
+# else
+# define LIBKIS_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#else // not windows
+
+#define LIBKIS_EXPORT KDE_EXPORT
+
+#endif /* not windows */
+
+/* Now the same for Krita*_TEST_EXPORT, if compiling with unit tests enabl=
ed */
+#ifdef COMPILING_TESTS
+# if defined _WIN32 || defined _WIN64
+# if defined(MAKE_LIBKIS_LIB)
+# define LIBKIS_TEST_EXPORT KDE_EXPORT
+# else
+# define LIBKIS_TEST_EXPORT KDE_IMPORT
+# endif
+# else /* not windows */
+# define LIBKIS_TEST_EXPORT KDE_EXPORT
+# endif
+#else /* not compiling tests */
+# define LIBKIS_TEST_EXPORT
+#endif
+
+#endif /* LIBKIS_EXPORT_H */
diff --git a/krita/plugins/extensions/pykrita/libkis/mainwindow.h b/krita/p=
lugins/extensions/pykrita/libkis/mainwindow.h
index de3f605..e044dea 100644
--- a/krita/plugins/extensions/pykrita/libkis/mainwindow.h
+++ b/krita/plugins/extensions/pykrita/libkis/mainwindow.h
@@ -19,7 +19,7 @@
#define LIBKIS_MAINWINDOW_H
=
#include <QObject>
-#include <krita_export.h>
+#include "libkis_export.h"
class KisMainWindow;
=
class LIBKIS_EXPORT MainWindow : public QObject
diff --git a/krita/plugins/extensions/pykrita/libkis/node.h b/krita/plugins=
/extensions/pykrita/libkis/node.h
index 3ff5b40..4a0830e 100644
--- a/krita/plugins/extensions/pykrita/libkis/node.h
+++ b/krita/plugins/extensions/pykrita/libkis/node.h
@@ -20,7 +20,7 @@
=
#include <QObject>
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class LIBKIS_EXPORT Node : public QObject
{
diff --git a/krita/plugins/extensions/pykrita/libkis/view.h b/krita/plugins=
/extensions/pykrita/libkis/view.h
index 635b015..637c33f 100644
--- a/krita/plugins/extensions/pykrita/libkis/view.h
+++ b/krita/plugins/extensions/pykrita/libkis/view.h
@@ -20,7 +20,7 @@
=
#include <QObject>
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class KisView;
=
diff --git a/krita/plugins/extensions/pykrita/libkis/viewextension.h b/krit=
a/plugins/extensions/pykrita/libkis/viewextension.h
index 9da585c..dfba914 100644
--- a/krita/plugins/extensions/pykrita/libkis/viewextension.h
+++ b/krita/plugins/extensions/pykrita/libkis/viewextension.h
@@ -19,7 +19,7 @@
#ifndef LIBKIS_VIEWEXTENSION_H
#define LIBKIS_VIEWEXTENSION_H
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
#include <QObject>
=
diff --git a/krita/plugins/extensions/pykrita/libkis/viewmanager.h b/krita/=
plugins/extensions/pykrita/libkis/viewmanager.h
index 9ec53b7..5f1207e 100644
--- a/krita/plugins/extensions/pykrita/libkis/viewmanager.h
+++ b/krita/plugins/extensions/pykrita/libkis/viewmanager.h
@@ -20,7 +20,7 @@
=
#include <QObject>
=
-#include <krita_export.h>
+#include "libkis_export.h"
=
class KisViewManager;
class QAction;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic