diff options
Diffstat (limited to '0016-Rename-qtmain-to-qt5main.patch')
| -rw-r--r-- | 0016-Rename-qtmain-to-qt5main.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch index d95196cb88bf..4208b7893593 100644 --- a/0016-Rename-qtmain-to-qt5main.patch +++ b/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001 +From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/33] Rename qtmain to qt5main @@ -12,10 +12,10 @@ 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 f099380cca..44c211d176 100644 +index e747ef16af..8b8a4ad240 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..5d553d9ca6 100644 +index 2ed708e085..e67917cc96 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -227,8 +227,8 @@ mac { @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.17.0 +2.18.0 |