Skip to content

Commit 4b45366

Browse files
author
telwertowski
committedMay 7, 2008
Remove all use of Qt3 compatibiliy routines except for the GRASS provider/plugin. Automatic casts of QString to char* have also been removed for compatibility with Qt/Mac-Cocoa (64-bit).
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8406 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

131 files changed

+1103
-1321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1103
-1321
lines changed
 

‎CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ FIND_PACKAGE(Qt4 REQUIRED)
151151

152152
INCLUDE( ${QT_USE_FILE} )
153153

154+
# Disable automatic conversion from QString to ASCII 8-bit strings (char *)
155+
# (Keeps code compatible with Qt/Mac/64bit)
156+
ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII)
157+
154158
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
155159
NAMES lrelease
156160
PATHS ${QT_BINARY_DIR}

‎python/core/qgsmaplayerregistry.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ signals:
8989
protected:
9090

9191
//! protected constructor
92-
QgsMapLayerRegistry( QObject * parent = 0, const char * name = 0 );
92+
QgsMapLayerRegistry( QObject * parent = 0 );
9393

9494

9595
}; // class QgsMapLayerRegistry

0 commit comments

Comments
 (0)
Please sign in to comment.