From e58293b3b0cb4664efca10229ae2e6556185e8a7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 1 Oct 2009 10:32:08 +0200
Subject: Compilation with pedantic or when QtCore is not specified in the
 include path

Note that i also removed the #error since the enum is already updated in master

Reviewed-by: Gabi
---
 src/corelib/io/qdatastream.h         | 6 +-----
 src/gui/s60framework/qs60mainappui.h | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 6e83204..7cf22f2 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -84,11 +84,7 @@ public:
         Qt_4_3 = 9,
         Qt_4_4 = 10,
         Qt_4_5 = 11,
-        Qt_4_6 = 12,
-#if QT_VERSION >= 0x040700
-#error Add the datastream version for this Qt version
-        Qt_4_7 = Qt_4_6
-#endif
+        Qt_4_6 = 12
     };
 
     enum ByteOrder {
diff --git a/src/gui/s60framework/qs60mainappui.h b/src/gui/s60framework/qs60mainappui.h
index c2c6ef2..321d8d6 100644
--- a/src/gui/s60framework/qs60mainappui.h
+++ b/src/gui/s60framework/qs60mainappui.h
@@ -42,7 +42,7 @@
 #ifndef QS60MAINAPPUI_H
 #define QS60MAINAPPUI_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 #ifdef Q_WS_S60
 
-- 
cgit v0.12