missing export declarations added

This commit is contained in:
Uwe Rathmann 2019-04-17 15:37:03 +02:00
parent 053fbe1ad2
commit 9e06fbecd1
2 changed files with 31 additions and 2 deletions

View File

@ -6,6 +6,7 @@
#ifndef QSK_ASPECT_H
#define QSK_ASPECT_H
#include "QskGlobal.h"
#include "QskFlags.h"
#include <qmetaobject.h>
@ -32,7 +33,7 @@
QSK_NAMESPACE( QskAspect )
{
extern const QMetaObject staticMetaObject;
extern QSK_EXPORT const QMetaObject staticMetaObject;
enum Subcontrol : quint16
{

View File

@ -7,9 +7,31 @@
#define QSK_NAMESPACE_H
#include "QskGlobal.h"
#include <qmetaobject.h>
namespace Qsk
/*
hack to run moc over a namespace, what is not
yet supported with Qt 5.6
*/
#ifdef Q_MOC_RUN
#define QSK_NAMESPACE( name ) struct name
#define QSK_ENUM( name ) Q_GADGET Q_ENUM( name )
#else
#define QSK_NAMESPACE( name ) namespace name
#define QSK_ENUM( name ) \
inline const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \
inline constexpr const char* qt_getEnumName(name) noexcept { return #name; }
#endif
QSK_NAMESPACE( Qsk )
{
extern QSK_EXPORT const QMetaObject staticMetaObject;
enum Direction
{
LeftToRight,
@ -17,6 +39,7 @@ namespace Qsk
TopToBottom,
BottomToTop
};
QSK_ENUM( Direction )
enum Position
{
@ -25,6 +48,7 @@ namespace Qsk
Right,
Bottom
};
QSK_ENUM( Position )
enum TextStyle
{
@ -33,6 +57,10 @@ namespace Qsk
Raised,
Sunken
};
QSK_ENUM( TextStyle )
}
#undef QSK_NAMESPACE
#undef QSK_ENUM
#endif