aboutsummarylogtreecommitdiffstats
path: root/qt5-use-win32-g++-mkspecs-profile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'qt5-use-win32-g++-mkspecs-profile.patch')
-rw-r--r--qt5-use-win32-g++-mkspecs-profile.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
deleted file mode 100644
index 5fc41308adf4..000000000000
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- mkspecs/win32-g++/qmake.conf.orig 2016-06-14 16:22:02.779947341 +0200
-+++ mkspecs/win32-g++/qmake.conf 2016-06-14 16:38:56.298752668 +0200
-@@ -25,7 +25,7 @@
- QMAKE_LEXFLAGS =
- QMAKE_YACC = byacc
- QMAKE_YACCFLAGS = -d
--QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport
-+QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport $${CROSS_COMPILE_CFLAGS}
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF = -w
-@@ -67,10 +67,10 @@
-
- QMAKE_LINK = $${CROSS_COMPILE}g++
- QMAKE_LINK_C = $${CROSS_COMPILE}gcc
--QMAKE_LFLAGS =
-+QMAKE_LFLAGS = -g
- QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
- QMAKE_LFLAGS_EXCEPTIONS_OFF =
--QMAKE_LFLAGS_RELEASE = -Wl,-s
-+QMAKE_LFLAGS_RELEASE =
- QMAKE_LFLAGS_DEBUG =
- QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
- QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
-@@ -95,21 +95,26 @@
- QMAKE_LIB_EXTENSIONS = a dll.a
-
- QMAKE_LIBS =
--QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
--QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
--QMAKE_LIBS_NETWORK = -lws2_32
-+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
-+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
-+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
- QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
--QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -lgdi32 -luser32
--QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d -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
--QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
-+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
-
--QMAKE_IDL = midl
-+QMAKE_IDL = $${CROSS_COMPILE}widl
- QMAKE_LIB = $${CROSS_COMPILE}ar -rc
- QMAKE_RC = $${CROSS_COMPILE}windres
-+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
-+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5
-
- QMAKE_STRIP = $${CROSS_COMPILE}strip
- QMAKE_STRIPFLAGS_LIB += --strip-unneeded
- QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
- QMAKE_NM = $${CROSS_COMPILE}nm -P
-+
-+PKG_CONFIG = $${CROSS_COMPILE}pkg-config
-+
- load(qt_config)