diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-01-07 14:56:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 19:07:23 +0100 |
| commit | f6841d2583d376726795acc376b8ca8df9634ca3 (patch) | |
| tree | e75197d0c1f5aefa1f931f80e44dfd274e5d7ec1 /src | |
| parent | 0a977e36e06a69583d8e4edc27ca3df634c53404 (diff) | |
Fix compile when QT_EVAL is defined
Change-Id: Id1acae0c5941e5409ca540017c0c0139e1cc4d2f
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index 6be8e82a1b..1385dc8231 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -117,7 +117,7 @@ static int qt_eval_days_left() QDate today = QDate::currentDate(); QDate build = QLibraryInfo::buildDate(); - return qMax(-1, today.daysTo(build) + 30); + return qMax<qint64>(-1, today.daysTo(build) + 30); } static QString qt_eval_string() @@ -198,7 +198,7 @@ void qt_core_eval_init(uint type) } #endif -#ifdef QT_BUILD_GUI_LIB +#ifdef QT_BUILD_WIDGETS_LIB QT_BEGIN_INCLUDE_NAMESPACE #include <qdialog.h> @@ -464,7 +464,7 @@ public: QFrame *border = new QFrame(this); QLabel *pixmap_label = new QLabel(border); - pixmap_label->setPixmap(qtlogo_eval_xpm); + pixmap_label->setPixmap(QPixmap(qtlogo_eval_xpm)); pixmap_label->setAlignment(Qt::AlignTop); QLabel *text_label = new QLabel(str, border); |