diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-12-08 13:16:37 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-12-08 14:00:20 (GMT) |
| commit | 6a91df13e4a4a91433b9670531426e53eef2c9be (patch) | |
| tree | ba05c490d29799cb37d3269853ffd0dccc4d5552 | |
| parent | c3b5bb6dbd137cb284e8841a8bcdf772834cf868 (diff) | |
| download | mxe-6a91df13e4a4a91433b9670531426e53eef2c9be.zip mxe-6a91df13e4a4a91433b9670531426e53eef2c9be.tar.gz mxe-6a91df13e4a4a91433b9670531426e53eef2c9be.tar.bz2 | |
qtbase: fix oci test
| -rw-r--r-- | src/qtbase-1.patch | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/qtbase-1.patch b/src/qtbase-1.patch index 6f49469..cec3396 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1.patch @@ -4,7 +4,7 @@ See index.html for further information. From 887009160dfb6568bd308c1982f011cbe9c60050 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 26 Feb 2013 13:23:33 +0100 -Subject: [PATCH 1/3] use pkg-config for freetype +Subject: [PATCH 1/4] use pkg-config for freetype Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a @@ -27,7 +27,7 @@ index 88be809..8fc19d2 100644 From 7a83bd3ccb820f1aefbe4043537cb0cc1bc7703b Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 18 May 2013 23:07:46 +0200 -Subject: [PATCH 2/3] use pkgconfig for icu detection (MXE specific) +Subject: [PATCH 2/4] use pkgconfig for icu detection (MXE specific) Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3 @@ -61,7 +61,7 @@ index 16267ff..dd9fb6c 100644 From 9d3e83abb9631a772f5ad86ac2f656a69bf3e7a5 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 3/3] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 3/4] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 @@ -90,3 +90,23 @@ index 7443368..c24e684 100644 -- 2.1.2 + +From 05c1768c2b5177461a8ccfbc5dd86b4bce74fe3f Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 8 Dec 2014 14:15:12 +0100 +Subject: [PATCH 4/4] fix oci config test on windows + +Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 + +diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro +index 3ffda1d..39b6f3759 100644 +--- a/config.tests/unix/oci/oci.pro ++++ b/config.tests/unix/oci/oci.pro +@@ -1,3 +1,3 @@ + SOURCES = oci.cpp + CONFIG -= qt dylib +-LIBS += -lclntsh ++!win32:LIBS += -lclntsh +-- +2.1.2 + |