Showing with 6 additions and 6 deletions.

+0 −4 images/icons/CMakeLists.txt

+4 −0 src/app/CMakeLists.txt

BIN {images/icons → src/app}/qgis.ico

+2 −2 src/providers/postgres/qgspostgresprovider.cpp
diff --git a/images/icons/CMakeLists.txt b/images/icons/CMakeLists.txt
@@ -3,10 +3,6 @@ FILE (GLOB IMAGES *.png)
 INSTALL (FILES ${IMAGES}
          DESTINATION ${QGIS_DATA_DIR}/images/icons)
 
-IF(MSVC)
-  INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
-ENDIF(MSVC)
-
 # OS X app/doc icons
 IF (APPLE)
   ADD_SUBDIRECTORY(mac)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -421,6 +421,10 @@ IF (SPATIALITE_FOUND)
   TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${SPATIALITE_LIBRARY})
 ENDIF (SPATIALITE_FOUND)
 
+IF(MSVC)
+  INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
+ENDIF(MSVC)
+
 INSTALL(TARGETS ${QGIS_APP_NAME}
   BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
   RUNTIME DESTINATION ${QGIS_BIN_DIR})

diff --git a/images/icons/qgis.ico → src/app/qgis.ico b/images/icons/qgis.ico → src/app/qgis.ico
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -977,7 +977,7 @@ bool QgsPostgresProvider::loadFields()
         fieldType = QVariant::Double;
 
         QRegExp re( "numeric\\((\\d+),(\\d+)\\)" );
-        if ( re.exactMatch( formattedFieldType ) && re.captureCount() == 2 )
+        if ( re.exactMatch( formattedFieldType ) )
         {
           fieldSize = re.cap( 1 ).toInt();
           fieldPrec = re.cap( 2 ).toInt();
@@ -1008,7 +1008,7 @@ bool QgsPostgresProvider::loadFields()
         fieldType = QVariant::String;
 
         QRegExp re( "char\\((\\d+)\\)" );
-        if ( re.exactMatch( formattedFieldType ) && re.captureCount() == 1 )
+        if ( re.exactMatch( formattedFieldType ) )
         {
           fieldSize = re.cap( 1 ).toInt();
         }