FIX : Qt 4.6.x compilation

openstreetmap · May 30, 2012 · c737beb · c737beb
1 parent 15b1d98
commit c737beb
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/Features/Node.h b/src/Features/Node.h
@@ -12,7 +12,7 @@
 #include <QtXml>
 
 #ifndef _MOBILE
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 #include <ggl/ggl.hpp>
 #include <ggl/geometries/register/point.hpp>
 #endif
@@ -158,7 +158,7 @@ class PhotoNode : public TrackNode
 Q_DECLARE_METATYPE( Node * );
 
 #ifndef _MOBILE
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 // Register this point as being a recognizable point by the GGL
 //GEOMETRY_REGISTER_POINT_2D_CONST(TrackPoint, qreal, cs::cartesian, projection().x(), projection().y())
 
@@ -182,7 +182,7 @@ struct access<NodePtr>
     template <std::size_t I>
     static inline qreal get(const NodePtr& p)
     {
-        return I == 0 ? p->projection().x() : p->projection().y();
+        return I == 0 ? p->projected().x() : p->projected().y();
     }
 
     //    template <std::size_t I>

diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <QList>
 
-#if QT_VERSION < 0x040700 && !defined(_MOBILE)
+#if (QT_VERSION < 0x040700 || defined(FORCE_46)) && !defined(_MOBILE)
 #include <ggl/ggl.hpp>
 #include <ggl/geometries/cartesian2d.hpp>
 #include <ggl/geometries/adapted/std_as_linestring.hpp>

diff --git a/src/Features/Way.h b/src/Features/Way.h
@@ -8,7 +8,7 @@
 #include "Layer.h"
 
 #ifndef _MOBILE
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 #include <ggl/ggl.hpp>
 #endif
 #endif

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -76,7 +76,7 @@
 #include "TerraceDialog.h"
 
 #include "revision.h"
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 #include <boost/version.hpp>
 #endif
 
@@ -2102,7 +2102,7 @@ void MainWindow::on_helpAboutAction_triggered()
     dlg.setWindowFlags(dlg.windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
     About.Version->setText(About.Version->text().arg(STRINGIFY(VERSION)).arg(STRINGIFY(REVISION)).arg(STRINGIFY(SVNREV)));
     About.QTVersion->setText(About.QTVersion->text().arg(qVersion()).arg(QT_VERSION_STR));
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
     int boostMajVer = BOOST_VERSION / 100000;
     int boostMinVer = BOOST_VERSION / 100 % 1000;
     About.BoostVersion->setText(About.BoostVersion->text().arg(QString::number(boostMajVer)+"."+QString::number(boostMinVer)));

diff --git a/src/PaintStyle/FeaturePainter.cpp b/src/PaintStyle/FeaturePainter.cpp
@@ -692,7 +692,7 @@ void FeaturePainter::drawLabel(Way* R, QPainter* thePainter, MapRenderer* theRen
 
     QPainterPath tranformedRoadPath = theRenderer->theTransform.map(R->getPath());
     QFont font = getLabelFont();
-//#if QT_VERSION >= 0x040700
+//#if QT_VERSION >= 0x040700 || defined(FORCE_46)
 //    qreal pathSurface = tranformedRoadPath.controlPointRect().width() * tranformedRoadPath.controlPointRect().height();
 //    if (pathSurface > theRenderer->theScreen.width() * theRenderer->theScreen.height() * 3) {
 //        QPainterPath clipPath;

diff --git a/src/Preferences/MerkaartorPreferences.cpp b/src/Preferences/MerkaartorPreferences.cpp
@@ -982,7 +982,7 @@ QString MerkaartorPreferences::getOsmWebsite() const
     else
         s = "www.openstreetmap.org";
 
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= 0x040600 && !defined(FORCE_46)
     QUrl u = QUrl::fromUserInput(s);
 #else
     // convenience for creating a valid URL

diff --git a/src/common/Coord.h b/src/common/Coord.h
@@ -64,7 +64,7 @@ uint qHash(const Coord &c);
 
 
 #ifndef _MOBILE
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 #include <ggl/ggl.hpp>
 #include <ggl/geometries/register/point.hpp>
 
@@ -206,7 +206,7 @@ class CoordBox : public QRectF
 Q_DECLARE_METATYPE( CoordBox );
 
 #ifndef _MOBILE
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 #include <ggl/geometries/register/box.hpp>
 
 GEOMETRY_REGISTER_BOX(CoordBox, Coord, bottomLeft, topRight)

diff --git a/src/common/Global.cpp b/src/common/Global.cpp
@@ -25,7 +25,7 @@ bool g_Merk_Segment_Mode = false;
 bool g_Merk_Ignore_Preferences = false;
 bool g_Merk_Reset_Preferences = false;
 bool g_Merk_IgnoreStartupTemplate = false;
-#if QT_VERSION < 0x040700
+#if QT_VERSION < 0x040700 || defined(FORCE_46)
 bool g_Merk_SelfClip = true;
 #else
 bool g_Merk_SelfClip = false;