Skip to content


Call setCodec("UTF-8") when reading UTF-8 text; it is not the default…
Browse files Browse the repository at this point in the history
… for Macs. Also change Qt deprecated Q_OS_MACX to Q_WS_MAC.

git-svn-id: c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed Dec 10, 2007
1 parent 7b40c2b commit 6d3eec0
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/app/qgsabout.cpp
Expand Up @@ -18,7 +18,7 @@

#include "qgsabout.h"
#include "qgsapplication.h"
#ifdef Q_OS_MACX
#ifdef Q_WS_MAC
#include <ApplicationServices/ApplicationServices.h>
#include <QInputDialog>
Expand Down Expand Up @@ -60,6 +60,9 @@ void QgsAbout::init()
if ( QIODevice::ReadOnly ) ) {
QTextStream stream( &file );
#ifdef Q_OS_DARWIN
QString line;
int i = 1;
Expand Down Expand Up @@ -219,7 +222,7 @@ void QgsAbout::on_btnQgisHome_clicked()

void QgsAbout::openUrl(QString url)
#ifdef Q_OS_MACX
#ifdef Q_WS_MAC
/* Use Mac OS X Launch Services which uses the user's default browser
* and will just open a new window if that browser is already running.
* QProcess creates a new browser process for each invocation and expects a
Expand Down

0 comments on commit 6d3eec0

Please sign in to comment.