GH-1379 fix build with Qt 5.2.1 on ubuntu64
This commit is contained in:
		| @@ -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 | ||||
| } | ||||
|   | ||||
| @@ -43,6 +43,7 @@ public: | ||||
|  | ||||
| 	State state() const; | ||||
| 	int exitCode() const; | ||||
| 	qint64 processId() const; | ||||
|  | ||||
| signals: | ||||
| 	void log(QStringList lines, MessageLevel::Enum level); | ||||
|   | ||||
| @@ -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. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user