Commit de3c8823 authored by Ralf Habacker's avatar Ralf Habacker
Browse files

Qt5 port of Q_WS_xxx macro usage to Q_OS_xxx.

parent 2deb55cd
...@@ -53,7 +53,7 @@ IDLImport::IDLImport(CodeImpThread* thread) : NativeImportBase(QLatin1String("// ...@@ -53,7 +53,7 @@ IDLImport::IDLImport(CodeImpThread* thread) : NativeImportBase(QLatin1String("//
if (!executable.isEmpty()) { if (!executable.isEmpty()) {
arguments << QLatin1String("-C"); // -C means "preserve comments" arguments << QLatin1String("-C"); // -C means "preserve comments"
} }
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
else { else {
executable = KStandardDirs::findExe(QLatin1String("cl")); executable = KStandardDirs::findExe(QLatin1String("cl"));
if (executable.isEmpty()) { if (executable.isEmpty()) {
......
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
static QString pngViewer() static QString pngViewer()
{ {
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
return QLatin1String("start"); return QLatin1String("start");
#else #else
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
return QLatin1String("unknown"); return QLatin1String("unknown");
#else #else
return QLatin1String("okular"); return QLatin1String("okular");
...@@ -54,10 +54,10 @@ static QString pngViewer() ...@@ -54,10 +54,10 @@ static QString pngViewer()
static QString textViewer() static QString textViewer()
{ {
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
return QLatin1String("start"); return QLatin1String("start");
#else #else
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
return QLatin1String("unknown"); return QLatin1String("unknown");
#else #else
return QLatin1String("mcedit"); return QLatin1String("mcedit");
......
...@@ -743,7 +743,7 @@ bool UMLDoc::saveDocument(const KUrl& url, const char * format) ...@@ -743,7 +743,7 @@ bool UMLDoc::saveDocument(const KUrl& url, const char * format)
} }
else { else {
// now remove the original file // now remove the original file
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
tmpfile.setAutoRemove(true); tmpfile.setAutoRemove(true);
KIO::FileCopyJob* fcj = KIO::file_copy(tmpfile.fileName(), url, -1, KIO::Overwrite); KIO::FileCopyJob* fcj = KIO::file_copy(tmpfile.fileName(), url, -1, KIO::Overwrite);
#else #else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment