From 59e6b4ed55403dad42b73d526683fa5e5698e3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 7 Jan 2016 06:40:26 +0100
Subject: GH-1379 fix build with Qt 5.2.1 on ubuntu64

---
 logic/launch/LoggedProcess.cpp | 9 +++++++++
 logic/launch/LoggedProcess.h   | 1 +
 logic/minecraft/RawLibrary.cpp | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'logic')

diff --git a/logic/launch/LoggedProcess.cpp b/logic/launch/LoggedProcess.cpp
index f6c866de..ffdec97b 100644
--- a/logic/launch/LoggedProcess.cpp
+++ b/logic/launch/LoggedProcess.cpp
@@ -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
+}
diff --git a/logic/launch/LoggedProcess.h b/logic/launch/LoggedProcess.h
index edbc78d0..baa53d79 100644
--- a/logic/launch/LoggedProcess.h
+++ b/logic/launch/LoggedProcess.h
@@ -43,6 +43,7 @@ public:
 
 	State state() const;
 	int exitCode() const;
+	qint64 processId() const;
 
 signals:
 	void log(QStringList lines, MessageLevel::Enum level);
diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp
index 7da743e4..9806a684 100644
--- a/logic/minecraft/RawLibrary.cpp
+++ b/logic/minecraft/RawLibrary.cpp
@@ -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.
-- 
cgit v1.2.3