Fix Qt 5 builds errors on OSX.

pasnox · Feb 28, 2016 · 264d665 · 264d665
1 parent ef09eb3
commit 264d665
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/pSettings.cpp b/src/core/pSettings.cpp
@@ -95,7 +95,7 @@ QString pSettings::Properties::filePath( pSettings::Type type ) const
         }
         case pSettings::Auto: {
 #ifdef Q_OS_MAC
-            const QString path = QString( "%1/../Resources" ).arg( QCoreApplication::applicationDirPath() );
+            const QString path = QSL( "%1/../Resources" ).arg( QCoreApplication::applicationDirPath() );
 #else
             const QString path = QCoreApplication::applicationDirPath();
 #endif

diff --git a/src/gui/actionmanager/pActionsModel.cpp b/src/gui/actionmanager/pActionsModel.cpp
@@ -397,8 +397,8 @@ QString pActionsModel::cleanPath( const QString& path )
 void pActionsModel::debugInternals()
 {
     foreach ( QAction* parent, mChildren.keys() ) {
-        qWarning() << ( parent ? parent->text() : "ROOT" ).toLocal8Bit().constData() << parent;
-        qWarning() << QString( 1, '\t' ).toLocal8Bit().constData() << mChildren.value( parent );
+        qWarning() << ( parent ? parent->text() : QSL("ROOT") ).toLocal8Bit().constData() << parent;
+        qWarning() << QL1C( '\t' ) << mChildren.value( parent );
     }
 
     qWarning() << mActions.keys();