Skip to content

Commit f239057

Browse files
Aleksandr PikalevPKEuS
authored andcommitted
Change Q_WS_WIN to Q_OS_WIN
Q_WS_* macroses were removed from Qt5. Use Q_OS_* instead.
1 parent b634a76 commit f239057

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

gui/applicationdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ ApplicationDialog::~ApplicationDialog()
5353
void ApplicationDialog::Browse()
5454
{
5555
QString filter;
56-
#ifdef Q_WS_WIN
56+
#ifdef Q_OS_WIN
5757
// In Windows (almost) all executables have .exe extension
5858
// so it does not make sense to show everything.
5959
filter += tr("Executable files (*.exe);;All files(*.*)");
60-
#endif // Q_WS_WIN
60+
#endif // Q_OS_WIN
6161
QString selectedFile = QFileDialog::getOpenFileName(this,
6262
tr("Select viewer application"),
6363
GetPath(SETTINGS_LAST_APP_PATH),

gui/resultstree.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void ResultsTree::StartApplication(QStandardItem *target, int application)
624624
//Replace (file) with filename
625625
QString file = data["file"].toString();
626626
file = QDir::toNativeSeparators(file);
627-
#ifdef Q_WS_WIN
627+
#ifdef Q_OS_WIN
628628
file.replace(QString("\\"), QString("\\\\"));
629629
#endif
630630
qDebug() << "Opening file: " << file;
@@ -667,14 +667,14 @@ void ResultsTree::StartApplication(QStandardItem *target, int application)
667667
QString program = app.getPath();
668668

669669
// In Windows we must surround paths including spaces with quotation marks.
670-
#ifdef Q_WS_WIN
670+
#ifdef Q_OS_WIN
671671
if (program.indexOf(" ") > -1) {
672672
if (!program.startsWith('"') && !program.endsWith('"')) {
673673
program.insert(0, "\"");
674674
program.append("\"");
675675
}
676676
}
677-
#endif // Q_WS_WIN
677+
#endif // Q_OS_WIN
678678

679679
const QString cmdLine = QString("%1 %2").arg(program).arg(params);
680680

0 commit comments

Comments
 (0)