[QGIS Commit] r8438 - in trunk/qgis: . src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-05-14 18:14:36 -0400 (Wed, 14 May 2008)
New Revision: 8438

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/src/app/qgsabout.cpp
Log:
revert r8437 and fix it different
- use FIND_PACKAGE(Qt4 REQUIRED) before SET(QT_... 1)
  as cmake's Modules/FindQt4.cmake suggests
- should also fix #913


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2008-05-14 21:02:26 UTC (rev 8437)
+++ trunk/qgis/CMakeLists.txt	2008-05-14 22:14:36 UTC (rev 8438)
@@ -133,6 +133,7 @@
 
 #############################################################
 # search for Qt4
+FIND_PACKAGE(Qt4 REQUIRED)
 
 SET( QT_USE_QT3SUPPORT TRUE )
 SET( QT_USE_QTXML      TRUE )
@@ -144,7 +145,6 @@
   ENABLE_TESTING()
 ENDIF (ENABLE_TESTS)
 
-FIND_PACKAGE(Qt4 REQUIRED)
 
 INCLUDE( ${QT_USE_FILE} )
 
@@ -230,7 +230,7 @@
   SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
 
   IF (UNIX AND NOT APPLE)
-    ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
+    ADD_DEFINITIONS(-DPREFIX=${CMAKE_INSTALL_PREFIX})
   ENDIF (UNIX AND NOT APPLE)
 
 ENDIF (WIN32)

Modified: trunk/qgis/src/app/qgsabout.cpp
===================================================================
--- trunk/qgis/src/app/qgsabout.cpp	2008-05-14 21:02:26 UTC (rev 8437)
+++ trunk/qgis/src/app/qgsabout.cpp	2008-05-14 22:14:36 UTC (rev 8438)
@@ -24,7 +24,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <QImageReader>
-#include <QtSql/QSqlDatabase>
+#include <QSqlDatabase>
 #include <iostream>
 
 /* Uncomment this block to use preloaded images