diff options
author | Martchus | 2018-09-25 15:26:24 +0200 |
---|---|---|
committer | Martchus | 2018-09-25 15:26:24 +0200 |
commit | 8186d9349d754c1a4f950c58f1a42ce6ef8ae520 (patch) | |
tree | d263b4d90c1de94fa4b4b5ef37fe63ba0dca655d /0016-Rename-qtmain-to-qt5main.patch | |
parent | 6799728a799c22d3e722cadf8838f59d833cb026 (diff) | |
download | aur-8186d9349d754c1a4f950c58f1a42ce6ef8ae520.tar.gz |
Update to 5.11.2
Diffstat (limited to '0016-Rename-qtmain-to-qt5main.patch')
-rw-r--r-- | 0016-Rename-qtmain-to-qt5main.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch index 6da5fd87b2e3..217a5489e7cb 100644 --- a/0016-Rename-qtmain-to-qt5main.patch +++ b/0016-Rename-qtmain-to-qt5main.patch @@ -1,7 +1,7 @@ -From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 +From 1bb8814307183b3311c99e0e4987ea0d84d487f2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 -Subject: [PATCH 16/34] Rename qtmain to qt5main +Subject: [PATCH 16/33] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package --- @@ -12,7 +12,7 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index e747ef16af..8b8a4ad240 100644 +index 48d1c49d44..a011f681eb 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.18.0 +2.19.0 |