Merge pull request #1 from rolk/master

Support compilation with Qt 4.6
OPM · Jul 6, 2012 · 5cd71c3 · 5cd71c3
2 parents 2c9695e + 0d17997
commit 5cd71c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
@@ -295,7 +295,7 @@ QString RifEclipseOutputFileTools::fileNameByType(const QStringList& fileSet, ec
         int reportNumber = -1;
         if (ecl_util_get_file_type(fileSet.at(i).toAscii().data(), &formatted, &reportNumber) == fileType)
         {
-            return QString(fileSet.at(i).data());
+            return fileSet.at(i);
         }
     }
 
@@ -319,7 +319,7 @@ QStringList RifEclipseOutputFileTools::fileNamesByType(const QStringList& fileSe
         int reportNumber = -1;
         if (ecl_util_get_file_type(fileSet.at(i).toAscii().data(), &formatted, &reportNumber) == fileType)
         {
-            fileNames.append(QString(fileSet.at(i).data()));
+            fileNames.append(fileSet.at(i));
         }
     }
 

diff --git a/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.cpp b/VisualizationModules/LibGuiQt/cvfqtBasicAboutDialog.cpp
@@ -347,10 +347,13 @@ QString BasicAboutDialog::openGLVersionString() const
 
     QGLFormat::OpenGLVersionFlags flags = QGLFormat::openGLVersionFlags();
 
-    if      (flags & QGLFormat::OpenGL_Version_4_0              ) versionString += "4.0";
+    if (false) ;
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0))
+    else if (flags & QGLFormat::OpenGL_Version_4_0              ) versionString += "4.0";
     else if (flags & QGLFormat::OpenGL_Version_3_3              ) versionString += "3.3";
     else if (flags & QGLFormat::OpenGL_Version_3_2              ) versionString += "3.2";
     else if (flags & QGLFormat::OpenGL_Version_3_1              ) versionString += "3.1";
+#endif /* QT_VERSION > 4.7 */
     else if (flags & QGLFormat::OpenGL_Version_3_0              ) versionString += "3.0";
     else if (flags & QGLFormat::OpenGL_ES_Version_2_0           ) versionString += "ES_Version 2.0";
     else if (flags & QGLFormat::OpenGL_ES_CommonLite_Version_1_1) versionString += "ES_CommonLite_Version 1.1";