|
|
@ -1,7 +1,7 @@
|
|
|
|
From bc3b0fcc85eefedf4c9a1e2e0275147031a51b76 Mon Sep 17 00:00:00 2001
|
|
|
|
From fd5d073ac9bb14d5c4e1c81d7943893f93b6ed14 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
Date: Fri, 23 May 2014 11:56:29 +0200
|
|
|
|
Date: Fri, 23 May 2014 11:56:29 +0200
|
|
|
|
Subject: [PATCH 1/2] fix private include
|
|
|
|
Subject: [PATCH 1/3] fix private include
|
|
|
|
|
|
|
|
|
|
|
|
Change-Id: I99639f5941e8695718e67e7b6871dd796585868f
|
|
|
|
Change-Id: I99639f5941e8695718e67e7b6871dd796585868f
|
|
|
|
|
|
|
|
|
|
|
@ -19,13 +19,13 @@ index 50f6858..49b55ab 100644
|
|
|
|
#include <QMutexLocker>
|
|
|
|
#include <QMutexLocker>
|
|
|
|
#include <QMetaObject>
|
|
|
|
#include <QMetaObject>
|
|
|
|
--
|
|
|
|
--
|
|
|
|
1.8.4.5
|
|
|
|
1.8.5.2 (Apple Git-48)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From b52a3abe8049a4c29c45d507c30c158aca41f18c Mon Sep 17 00:00:00 2001
|
|
|
|
From 94f1c7d40d0b16697ee5d14725c387187c970d55 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
|
|
Date: Fri, 23 May 2014 12:04:12 +0200
|
|
|
|
Date: Fri, 23 May 2014 12:04:12 +0200
|
|
|
|
Subject: [PATCH 2/2] fix filename case
|
|
|
|
Subject: [PATCH 2/3] fix filename case
|
|
|
|
|
|
|
|
|
|
|
|
Make it possible to cross compile on case sensitive system.
|
|
|
|
Make it possible to cross compile on case sensitive system.
|
|
|
|
|
|
|
|
|
|
|
@ -77,5 +77,37 @@ index ce1e83a..4b0f9bd 100644
|
|
|
|
#include <QUuid>
|
|
|
|
#include <QUuid>
|
|
|
|
#include <comutil.h>
|
|
|
|
#include <comutil.h>
|
|
|
|
--
|
|
|
|
--
|
|
|
|
1.8.4.5
|
|
|
|
1.8.5.2 (Apple Git-48)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From 13ea9cd4743555d8d05e8dae2448ea3499bd418f Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
|
|
|
|
|
|
Date: Tue, 10 Jun 2014 19:49:08 +1000
|
|
|
|
|
|
|
|
Subject: [PATCH 3/3] fix lib casing
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
|
|
|
|
|
|
|
|
index eaf46e8..1165c3d 100644
|
|
|
|
|
|
|
|
--- a/src/systeminfo/systeminfo.pro
|
|
|
|
|
|
|
|
+++ b/src/systeminfo/systeminfo.pro
|
|
|
|
|
|
|
|
@@ -44,13 +44,10 @@ win32: !simulator: {
|
|
|
|
|
|
|
|
windows/qwmihelper_win.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LIBS += \
|
|
|
|
|
|
|
|
- -lOle32 \
|
|
|
|
|
|
|
|
- -lUser32 \
|
|
|
|
|
|
|
|
- -lGdi32 \
|
|
|
|
|
|
|
|
- -lIphlpapi \
|
|
|
|
|
|
|
|
- -lOleaut32 \
|
|
|
|
|
|
|
|
- -lPowrProf \
|
|
|
|
|
|
|
|
- -lSetupapi
|
|
|
|
|
|
|
|
+ -lole32 \
|
|
|
|
|
|
|
|
+ -liphlpapi \
|
|
|
|
|
|
|
|
+ -loleaut32 \
|
|
|
|
|
|
|
|
+ -lsetupapi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
win32-g++: {
|
|
|
|
|
|
|
|
LIBS += -luser32 -lgdi32
|
|
|
|
|
|
|
|
--
|
|
|
|
|
|
|
|
1.8.5.2 (Apple Git-48)
|
|
|
|
|
|
|
|
|
|
|
|