feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile fix with Qt 4

Browse Source 
Change-Id: I28b9a63a066521cdbe67ad9b51d795450b6d070a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-02-14 16:00:56 +01:00
parent ef7a5836be
commit e47acb151b
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/diffeditor/differ.cpp
View File

@@ -40,6 +40,7 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/
#include <QList> #include <QList>
#include <QStringList> #include <QStringList>
#include <QMap> #include <QMap>
#include <QPair>
#include <QCoreApplication> #include <QCoreApplication>
namespace DiffEditor { namespace DiffEditor {

2
src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
View File

@@ -986,10 +986,12 @@ void CustomWizardContext::reset()
currentDate.toString(Qt::ISODate)); currentDate.toString(Qt::ISODate));
baseReplacements.insert(QLatin1String("CurrentTime:ISO"), baseReplacements.insert(QLatin1String("CurrentTime:ISO"),
currentTime.toString(Qt::ISODate)); currentTime.toString(Qt::ISODate));
#if QT_VERSION >= 0x050000
baseReplacements.insert(QLatin1String("CurrentDate:RFC"), baseReplacements.insert(QLatin1String("CurrentDate:RFC"),
currentDate.toString(Qt::RFC2822Date)); currentDate.toString(Qt::RFC2822Date));
baseReplacements.insert(QLatin1String("CurrentTime:RFC"), baseReplacements.insert(QLatin1String("CurrentTime:RFC"),
currentTime.toString(Qt::RFC2822Date)); currentTime.toString(Qt::RFC2822Date));
#endif
baseReplacements.insert(QLatin1String("CurrentDate:Locale"), baseReplacements.insert(QLatin1String("CurrentDate:Locale"),
currentDate.toString(Qt::DefaultLocaleShortDate)); currentDate.toString(Qt::DefaultLocaleShortDate));
baseReplacements.insert(QLatin1String("CurrentTime:Locale"), baseReplacements.insert(QLatin1String("CurrentTime:Locale"),