0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1379 fix build with Qt 5.2.1 on ubuntu64

Browse Source
This commit is contained in:
Petr Mrázek 2016-01-07 06:40:26 +01:00
parent 5ff9f90ce9
commit 59e6b4ed55
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
logic/launch/LoggedProcess.cpp
View File

@ -148,3 +148,12 @@ void LoggedProcess::on_stateChange(QProcess::ProcessState state)
}
}
}
qint64 LoggedProcess::processId() const
{
#ifdef Q_OS_WIN
return pid() ? pid()->dwProcessId : 0;
#else
return pid();
#endif
}

1
logic/launch/LoggedProcess.h
View File

@ -43,6 +43,7 @@ public:
State state() const;
int exitCode() const;
qint64 processId() const;
signals:
void log(QStringList lines, MessageLevel::Enum level);

2
logic/minecraft/RawLibrary.cpp
View File

@ -74,7 +74,7 @@ RawLibraryPtr RawLibrary::fromJsonPlus(const QJsonObject &libObj, const QString
auto lib = RawLibrary::fromJson(libObj, filename);
if (libObj.contains("insert"))
{
QJsonValue insertVal = ensureJsonValue(libObj.value("insert"), "library insert rule");
QJsonValue insertVal = ensureJsonValue(libObj.value("insert"), QString("library insert rule"));
if (insertVal.isString())
{
// it's just a simple string rule. OK.