Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win32:Qt515
mingw32-libqt5-qtbase
0001-Use-lib-prefix-for-shared-libraries-and-mo...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-Use-lib-prefix-for-shared-libraries-and-module-on-Wind.patch of Package mingw32-libqt5-qtbase
From 43ea9f4ac5d17ad859b941349771c8035602eaa7 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Tue, 16 Jul 2019 17:21:56 +0200 Subject: [PATCH] Use 'lib' prefix for shared libraries and module on Windows to be different from msvc Currently hardcoded for mingw. Change-Id: I69be89a96f98761edcc53d4bc2d0a93bf6b4a6f9 --- mkspecs/common/g++-win32.conf | 2 +- src/corelib/plugin/qlibrary_win.cpp | 2 +- files changed, 6 insertions(+), 6 deletions(-) --- a/mkspecs/common/g++-win32.conf 2020-07-24 12:59:12.089450871 +0000 +++ b/mkspecs/common/g++-win32.conf 2020-07-24 12:59:22.657366080 +0000 @@ -54,7 +54,7 @@ } QMAKE_EXT_OBJ = .o QMAKE_EXT_RES = _res.o -QMAKE_PREFIX_SHLIB = +QMAKE_PREFIX_SHLIB = lib QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a --- a/mkspecs/features/create_cmake.prf 2020-07-27 17:26:11.547520052 +0000 +++ b/mkspecs/features/create_cmake.prf 2020-07-27 17:27:25.926916274 +0000 @@ -138,8 +138,13 @@ win32 { isEmpty(CMAKE_STATIC_TYPE) { + mingw { + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.dll + CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.dll + } else { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll + } } else:mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a @@ -223,10 +223,10 @@ CMAKE_WINDOWS_BUILD = "true" CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll - mingw { + CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}d.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -242,6 +242,9 @@ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll.a } } else { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}d.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index a4d3f67c27..b54616a3c7 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -58,7 +58,7 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion) QStringList QLibraryPrivate::prefixes_sys() { - return QStringList(); + return QStringList(QStringLiteral("lib")); } bool QLibraryPrivate::load_sys() -- 2.13.7
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor