diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-13 09:54:00 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-13 10:02:37 +0300 |
| commit | 8d40bdcbe7181a225311d6f59fbeeb772a69f069 (patch) | |
| tree | 6a6c46edfb5d7a45ed9352cc13f40975b083c06c /src/datavis3d/global/qdatavis3dglobal.h | |
| parent | c89c18631f9d8770eb5db16a86043e6079cefaf3 (diff) | |
Renamed QTENTERPRISE_DATA.. -> QT_DATA..
Safer, in case enterprise is changed some time in the future.
+ changed 3 functions in to properties in q3dbars
Change-Id: If6cc6bdc8beb4fa7b1e7482b1d5d6769b89925c1
Change-Id: If6cc6bdc8beb4fa7b1e7482b1d5d6769b89925c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/global/qdatavis3dglobal.h')
| -rw-r--r-- | src/datavis3d/global/qdatavis3dglobal.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index 308e8607..4ae70fe4 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h @@ -28,47 +28,47 @@ // Uncomment this if you want to try hardcoded QML2 -integration h4x0r version of the engine //#define USE_QML2_VERSION -#define QTENTERPRISE_DATAVIS3D_VERSION_STR "0.0.1" +#define QT_DATAVIS3D_VERSION_STR "0.0.1" /* - QTENTERPRISE_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. + QT_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QTENTERPRISE_DATAVIS3D_VERSION 0x000001 +#define QT_DATAVIS3D_VERSION 0x000001 /* - can be used like #if (QTENTERPRISE_DATAVIS3D_VERSION >= QTENTERPRISE_DATAVIS3D_VERSION_CHECK(1, 1, 0)) + can be used like #if (QT_DATAVIS3D_VERSION >= QT_DATAVIS3D_VERSION_CHECK(1, 1, 0)) */ -#define QTENTERPRISE_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +#define QT_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_EXPORT +#if defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_EXPORT Q_DECL_EXPORT #else -# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_IMPORT +# define QT_DATAVIS3D_EXPORT Q_DECL_IMPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT +#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT +#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT #else -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT +# define QT_DATAVIS3D_AUTOTEST_EXPORT #endif -#ifdef QTENTERPRISE_DATAVIS3D_STATICLIB -# undef QTENTERPRISE_DATAVIS3D_EXPORT -# undef QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT -# define QTENTERPRISE_DATAVIS3D_EXPORT -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT +#ifdef QT_DATAVIS3D_STATICLIB +# undef QT_DATAVIS3D_EXPORT +# undef QT_DATAVIS3D_AUTOTEST_EXPORT +# define QT_DATAVIS3D_EXPORT +# define QT_DATAVIS3D_AUTOTEST_EXPORT #endif -#define QTENTERPRISE_DATAVIS3D_NAMESPACE QtDataVis3D +#define QT_DATAVIS3D_NAMESPACE QtDataVis3D -#ifdef QTENTERPRISE_DATAVIS3D_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE namespace QTENTERPRISE_DATAVIS3D_NAMESPACE { -# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE } -# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE using namespace QTENTERPRISE_DATAVIS3D_NAMESPACE; +#ifdef QT_DATAVIS3D_NAMESPACE +# define QT_DATAVIS3D_BEGIN_NAMESPACE namespace QT_DATAVIS3D_NAMESPACE { +# define QT_DATAVIS3D_END_NAMESPACE } +# define QT_DATAVIS3D_USE_NAMESPACE using namespace QT_DATAVIS3D_NAMESPACE; #else -# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE +# define QT_DATAVIS3D_BEGIN_NAMESPACE +# define QT_DATAVIS3D_END_NAMESPACE +# define QT_DATAVIS3D_USE_NAMESPACE #endif #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG) |