diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-12-07 21:30:35 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@nokia.com> | 2011-12-09 16:01:32 +0100 |
commit | 5765974100f4043be80cd7e72f7dc53110c53ebe (patch) | |
tree | 61fd01f03fc2ed93585fa6212b35940395bee3c2 /src/compositor/global | |
parent | 1a527e222cbaa6a0649935fad80b2acdae9dd0a0 (diff) |
Made a global directory, and moved the export header there...
I'm not sure if the header file name is what we want, but will do for
now.
Change-Id: Ief7f006b0f59b53295e6a11c222d8c459a80683d
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
Diffstat (limited to 'src/compositor/global')
-rw-r--r-- | src/compositor/global/global.pri | 5 | ||||
-rw-r--r-- | src/compositor/global/waylandexport.h | 54 |
2 files changed, 59 insertions, 0 deletions
diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri new file mode 100644 index 000000000..bdabcbfcf --- /dev/null +++ b/src/compositor/global/global.pri @@ -0,0 +1,5 @@ +INCLUDEPATH += $$PWD + +HEADERS += $$PWD/waylandexport.h + + diff --git a/src/compositor/global/waylandexport.h b/src/compositor/global/waylandexport.h new file mode 100644 index 000000000..e137d6fea --- /dev/null +++ b/src/compositor/global/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 |