Replaced Q_WS_WIN32 with Q_OS_WIN.
--HG-- branch : feature
This commit is contained in:
parent
41c80d040f
commit
ccbd9415f0
|
@ -39,7 +39,7 @@ DialogPatternProperties::DialogPatternProperties(VDomDocument *doc, QWidget *par
|
|||
|
||||
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(),
|
||||
QApplication::applicationName());
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString();
|
||||
#else
|
||||
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString();
|
||||
|
|
|
@ -105,7 +105,7 @@ void DialogStandardMeasurements::CheckState()
|
|||
|
||||
void DialogStandardMeasurements::LoadStandardTables()
|
||||
{
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
const QString pathToTables = QString("/standard_tables");
|
||||
#else
|
||||
#ifdef QT_DEBUG
|
||||
|
|
|
@ -222,7 +222,7 @@ QGroupBox *PatternPage::UserGroup()
|
|||
|
||||
userName = new QLineEdit;
|
||||
Q_CHECK_PTR(userName);
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USERNAME").constData())).toString();
|
||||
#else
|
||||
QString user = settings.value("pattern/user", QString::fromLocal8Bit(qgetenv("USER").constData())).toString();
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "tablewindow.h"
|
||||
#include "options.h"
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
const QString translationsPath = QString("/translations");
|
||||
#else
|
||||
#ifdef QT_DEBUG
|
||||
|
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
|
|||
app.installTranslator(&qtTranslator);
|
||||
|
||||
QTranslator appTranslator;
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
appTranslator.load("valentina_" + checkedLocale, "."+translationsPath);
|
||||
#else
|
||||
#ifdef QT_DEBUG
|
||||
|
|
|
@ -513,7 +513,7 @@ void TableWindow::PdfToPs(const QString &name, const QStringList ¶ms) const
|
|||
QProcess proc;
|
||||
QString program;
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
#ifdef Q_OS_WIN
|
||||
program = "pdftops.exe";
|
||||
#else
|
||||
program = "pdftops";
|
||||
|
|
Loading…
Reference in New Issue
Block a user