From e47acb151bcf7946540ab4ff0281ae066cba7566 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Fri, 14 Feb 2014 16:00:56 +0100
Subject: [PATCH] Compile fix with Qt 4

Change-Id: I28b9a63a066521cdbe67ad9b51d795450b6d070a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/plugins/diffeditor/differ.cpp                               | 1 +
 .../projectexplorer/customwizard/customwizardparameters.cpp     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp
index 58b3487c39a..f8d56604182 100644
--- a/src/plugins/diffeditor/differ.cpp
+++ b/src/plugins/diffeditor/differ.cpp
@@ -40,6 +40,7 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/
 #include <QList>
 #include <QStringList>
 #include <QMap>
+#include <QPair>
 #include <QCoreApplication>
 
 namespace DiffEditor {
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 46ae852e3cb..37a18f94010 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -986,10 +986,12 @@ void CustomWizardContext::reset()
                             currentDate.toString(Qt::ISODate));
     baseReplacements.insert(QLatin1String("CurrentTime:ISO"),
                             currentTime.toString(Qt::ISODate));
+#if QT_VERSION >= 0x050000
     baseReplacements.insert(QLatin1String("CurrentDate:RFC"),
                             currentDate.toString(Qt::RFC2822Date));
     baseReplacements.insert(QLatin1String("CurrentTime:RFC"),
                             currentTime.toString(Qt::RFC2822Date));
+#endif
     baseReplacements.insert(QLatin1String("CurrentDate:Locale"),
                             currentDate.toString(Qt::DefaultLocaleShortDate));
     baseReplacements.insert(QLatin1String("CurrentTime:Locale"),