diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-04 10:22:24 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-11 04:49:27 +0000 |
| commit | 282f531e63961300be055665acc454356de889fa (patch) | |
| tree | b489b56eb7ebc95ce87685911b8676d9f1d59638 /recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch | |
| parent | 7fe6320da2cb4abec0512ca57e4177ca8de897d6 (diff) | |
qt5: update submodulesv5.13.0-alpha
Update to 5.13.0 Alpha
Task-number: QTBUG-72311
Change-Id: I50ce9d42088d4171fd04b340b4cf297b07400445
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch b/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch deleted file mode 100644 index a66145c4..00000000 --- a/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d26359039f488f1569a581f3e266b1ff236600fc Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 7 Jan 2019 10:29:53 +0200 -Subject: [PATCH] qmake: use default libdirs to search for prl libs - -Default libdirs are never added to the modules' LIBS and if -Qt was configured to use one of the default libdirs, module -might end up without any path to search for its prl files. - -Add default libdirs to the search path similar as it's done -in unix/makefile generator. - -Fixes: QTBUG-72855 -Change-Id: I43c5bae0d54ba9427ab0ad3eab61ba0c4e2cbde8 -Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> ---- - qmake/generators/win32/winmakefile.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 6e4b9a1eb5..a855fcd0a5 100644 ---- a/qmake/generators/win32/winmakefile.cpp -+++ b/qmake/generators/win32/winmakefile.cpp -@@ -84,6 +84,8 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) - if (impexts.isEmpty()) - impexts = project->values("QMAKE_EXTENSION_STATICLIB"); - QList<QMakeLocalFileName> dirs; -+ for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -+ dirs.append(QMakeLocalFileName(dlib.toQString())); - static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE", - "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; - for (int i = 0; lflags[i]; i++) { |