Add a exportglobal file since we cant use qglobal.h anymore

Change-Id: I993132278bb26467a13199afbb9b4aecfe0da7fa
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

diff --git a/src/compositor/compositor_api/waylandexport.h b/src/compositor/compositor_api/waylandexport.h
new file mode 100644 (file)
index 0000000..e137d6f
--- /dev/null
+++ b/src/compositor/compositor_api/waylandexport.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** This file is part of QtCompositor**
+**
+** Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+**
+** Contact:  Nokia Corporation qt-info@nokia.com
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in the
+** documentation and/or other materials provided with the distribution.
+**
+** Neither the name of Nokia Corporation and its Subsidiary(-ies) nor the
+** names of its contributors may be used to endorse or promote products
+** derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************/
+
+#ifndef WAYLANDEXPORT_H
+#define WAYLANDEXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if !defined(Q_COMPOSITOR_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_COMPOSITOR_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_COMPOSITOR_EXPORT
+#  endif
+#endif
+
+#endif //WAYLANDEXPORT_H

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h
index 9f2973a..06d8ec7 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/qt-compositor/compositor_api/waylandcompositor.h
@@ -41,6 +41,8 @@
 #ifndef QTCOMP_H
 #define QTCOMP_H
 
+#include "waylandexport.h"
+
 #include <QObject>
 #include <QImage>
 #include <QRect>

diff --git a/src/qt-compositor/compositor_api/waylandsurface.h b/src/qt-compositor/compositor_api/waylandsurface.h
index d7cb218..fb2e172 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurface.h
+++ b/src/qt-compositor/compositor_api/waylandsurface.h
@@ -41,6 +41,8 @@
 #ifndef WAYLANDSURFACE_H
 #define WAYLANDSURFACE_H
 
+#include "waylandexport.h"
+
 #include <QtCore/QScopedPointer>
 #include <QtGui/QImage>
 #include <QtCore/QVariantMap>

diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.h b/src/qt-compositor/compositor_api/waylandsurfaceitem.h
index 6a0ae34..78fcd0c 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.h
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.h
@@ -41,8 +41,10 @@
 #ifndef WAYLANDSURFACEITEM_H
 #define WAYLANDSURFACEITEM_H
 
-#include <QQuickItem>
-#include <qsgtexture.h>
+#include "waylandexport.h"
+
+#include <QtQuick/QQuickItem>
+#include <QtQuick/qsgtexture.h>
 
 #include <private/qsgtextureprovider_p.h>