AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile when QT_EVAL is defined

Browse Source 
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>
This commit is contained in:
Andy Shaw 2013-01-07 14:56:07 +01:00 committed by The Qt Project
parent 0a977e36e0
commit f6841d2583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qtcore_eval.cpp
View File

@ -117,7 +117,7 @@ static int qt_eval_days_left()
QDate today = QDate::currentDate(); QDate today = QDate::currentDate();
QDate build = QLibraryInfo::buildDate(); QDate build = QLibraryInfo::buildDate();
return qMax(-1, today.daysTo(build) + 30); return qMax<qint64>(-1, today.daysTo(build) + 30);
} }
static QString qt_eval_string() static QString qt_eval_string()
@ -198,7 +198,7 @@ void qt_core_eval_init(uint type)
} }
#endif #endif
#ifdef QT_BUILD_GUI_LIB #ifdef QT_BUILD_WIDGETS_LIB
QT_BEGIN_INCLUDE_NAMESPACE QT_BEGIN_INCLUDE_NAMESPACE
#include <qdialog.h> #include <qdialog.h>
@ -464,7 +464,7 @@ public:
QFrame *border = new QFrame(this); QFrame *border = new QFrame(this);
QLabel *pixmap_label = new QLabel(border); QLabel *pixmap_label = new QLabel(border);
pixmap_label->setPixmap(qtlogo_eval_xpm); pixmap_label->setPixmap(QPixmap(qtlogo_eval_xpm));
pixmap_label->setAlignment(Qt::AlignTop); pixmap_label->setAlignment(Qt::AlignTop);
QLabel *text_label = new QLabel(str, border); QLabel *text_label = new QLabel(str, border);