| qmobilityglobal.h | qmobilityglobal.h | |||
|---|---|---|---|---|
| skipping to change at line 44 | skipping to change at line 44 | |||
| ** met: http://www.gnu.org/copyleft/gpl.html. | ** met: http://www.gnu.org/copyleft/gpl.html. | |||
| ** | ** | |||
| ** If you are unsure which license is appropriate for your use, please | ** If you are unsure which license is appropriate for your use, please | |||
| ** contact the sales department at qt-sales@nokia.com. | ** contact the sales department at qt-sales@nokia.com. | |||
| ** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
| ** | ** | |||
| *************************************************************************** */ | *************************************************************************** */ | |||
| #ifndef QMOBILITYGLOBAL_H | #ifndef QMOBILITYGLOBAL_H | |||
| #define QMOBILITYGLOBAL_H | #define QMOBILITYGLOBAL_H | |||
| #define QTM_VERSION_STR "1.1.1" | #define QTM_VERSION_STR "1.1.3" | |||
| /* | /* | |||
| QTM_VERSION is (major << 16) + (minor << 8) + patch. | QTM_VERSION is (major << 16) + (minor << 8) + patch. | |||
| */ | */ | |||
| #define QTM_VERSION 0x010101 | #define QTM_VERSION 0x010103 | |||
| /* | /* | |||
| can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 1)) | can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 2)) | |||
| */ | */ | |||
| #define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(pat ch)) | #define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(pat ch)) | |||
| #define QTM_PACKAGEDATE_STR "2011-02-28" | #define QTM_PACKAGEDATE_STR "2011-04-19" | |||
| #define QTM_PACKAGE_TAG "84ae67b72382124f8f1a62c6e160fe14cdcd3167" | #define QTM_PACKAGE_TAG "4ce5093f2cc2ca1d7f7f5a052c33c8a6036cb6e5" | |||
| #include <QtCore/qglobal.h> | #include <QtCore/qglobal.h> | |||
| #if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL) | #if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL) | |||
| # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | |||
| #elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SY MBIAN)) && defined(QT_DLL) | #elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SY MBIAN)) && defined(QT_DLL) | |||
| # define QM_AUTOTEST_EXPORT Q_DECL_IMPORT | # define QM_AUTOTEST_EXPORT Q_DECL_IMPORT | |||
| #elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED) | #elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED) | |||
| # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | |||
| #else | #else | |||
| # define QM_AUTOTEST_EXPORT | # define QM_AUTOTEST_EXPORT | |||
| End of changes. 5 change blocks. | ||||
| 5 lines changed or deleted | 5 lines changed or added | |||