diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-06 16:38:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-06 16:38:21 (GMT) |
| commit | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (patch) | |
| tree | 665066487f649aaa9d6e8835e5a90635cf6fa04c /src/corelib | |
| parent | 9b93fed2c689d68bc91f33e6ac43d340403f9b0e (diff) | |
| parent | 53c36eb868a800569557e01ba075964127e9cffd (diff) | |
| download | Qt-12d14efb2e1df3188c7c0001492f24fd193a11a9.zip Qt-12d14efb2e1df3188c7c0001492f24fd193a11a9.tar.gz Qt-12d14efb2e1df3188c7c0001492f24fd193a11a9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 15a06d7..15325ae 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -212,11 +212,13 @@ QLibraryInfo::buildKey() Returns the installation date for this build of Qt. The install date will usually be the last time that Qt sources were configured. */ +#ifndef QT_NO_DATESTRING QDate QLibraryInfo::buildDate() { return QDate::fromString(QString::fromLatin1(qt_configure_installation + 12), Qt::ISODate); } +#endif //QT_NO_DATESTRING /*! Returns the location specified by \a loc. diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 88e8566..f65051d 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -60,7 +60,9 @@ public: static QString licensedProducts(); static QString buildKey(); +#ifndef QT_NO_DATESTRING static QDate buildDate(); +#endif //QT_NO_DATESTRING enum LibraryLocation { |