summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QSQL: add support for PostgreSQL 11Christian Ehrlicher2018-12-202-1/+4
| | | | | | | | | | | | Add support for PostgreSQL 11 by adding QPSQLDriver::Version11 and use it in qMakePSQLVersion(). [ChangeLog][QSQL][PostgreSQL] Added support for PostgreSQL 11 Fixes: QTBUG-71642 Change-Id: Ie3cd3a81fd00084b587457b91b4e92c2e7001172 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Robert Szefner <robertsz27@interia.pl>
* qmake: remove support for pre-5.6 qt module prisOswald Buddenhagen2018-12-201-22/+0
| | | | | | | it seems rather obsolete by now. Change-Id: I43a84367fbe9f82c3adc0e3825d14198e69eaa1f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qmake: fix typo in function nameOswald Buddenhagen2018-12-201-6/+6
| | | | | Change-Id: Ie88ae0f13be83d6e63078eeb359d9ddf012c94fb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: fixify target paths of extra compilers more consistentlyOswald Buddenhagen2018-12-201-15/+19
| | | | | | | | | | ... so we don't get into situations where a target has a relative path, while another target depends on it with an absolute path. Task-number: QTBUG-36768 Change-Id: Icc5b249914bb3f095f4a6542c30bacf5ea6f9ec9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qmake: Add support for installing executable files without calling stripAndy Shaw2018-12-201-2/+3
| | | | | | | | | | | Since some files are still executable (such as bash scripts) then they should not get strip called on them when installing in those cases. So by adding .CONFIG = nostrip, it indicates that strip should not be called on this. Fixes: QTBUG-60751 Change-Id: I19d502c07644daf9d487a8817c8e57d96eedab60 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Empty filenames does not existSune Vuorela2018-12-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | If empty paths is passed to the unix filesystem engine, we get a warning about empty filename passed to function, before returning false. Fix this by testing for empty string first, and don't send empty string to file engine. The current warning leads to code like if (!filename.isEmpty() && QFile::exists(filename)) { // } rather than the slightly cleaner if (QFile::exists(filename)) { // } Change-Id: I0207324889ec22e5a072c28d58337d117b0153b1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* configure: modernize iconv useOswald Buddenhagen2018-12-197-127/+42
| | | | | | | use library objects for all variants, and inline the tests. Change-Id: I029f9a6655a783dab4a22abf601aadbb484c03af Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: enable inline tests to refer to PWDOswald Buddenhagen2018-12-195-108/+34
| | | | | | | ... and use that to inline the xlocalescanprint test. Change-Id: I0973133d7f9ecc9a38b70dc4b83df174a35b2b1f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: enable inline tests to contain auxiliary filesOswald Buddenhagen2018-12-195-50/+20
| | | | | | | ... and use that to migrate the pch test. Change-Id: I2ce884442cab6124c37142f571cf6f82191ee4f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: inline openssl test sourcesOswald Buddenhagen2018-12-195-108/+23
| | | | | Change-Id: I47c1c43b5db30cf1d59de9c6c20ca83abef2cf8c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: enable sharing of inlined source code between testsOswald Buddenhagen2018-12-191-18/+41
| | | | | | | | | this is implemented by means of (multiple) inheritance, which applies specifically only to the inlined source and header list, but not to library sources or dependencies. Change-Id: I8f1d5b34d1d2d12e39225dc50357ad6ec648c6b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: normalize dashes to underscores in exported librariesOswald Buddenhagen2018-12-193-12/+13
| | | | | | | it works without it, but technically speaking it's undefined behavior. Change-Id: Icdcdd5b923ce4cecd9dc9e75f9d5d66d0fa8a032 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: add support for multiple libdirs in inline library sourcesOswald Buddenhagen2018-12-191-2/+6
| | | | | | | | | | | | | while the command line doesn't actually permit it (that can be re-evaluated separately), derivatives of the inline source type may want to inject additional paths, as is the case with opcua. the incdir field supports multiple entries without additional action. Change-Id: I3860ca1fc8fab25c04eb63bdb2f855b77ff3b9a4 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: move QT_BEGIN_NAMESPACE to correct placeOswald Buddenhagen2018-12-192-3/+3
| | | | | | | | this makes no difference whatsoever, because qmake isn't actually built in a namespace, but it makes the new qtc code model happy. Change-Id: I70ad8e16cceff73276a821219fc80bab365954b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* wasm: emit finished after QNetworkReply abortLorn Potter2018-12-182-10/+25
| | | | | | Change-Id: I23445f5e0c936b82aa5d65b261d456a563deab9a Fixes: QTBUG-72516 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Doc: mark QMetaObject::invokeMethod overloads as threadsafeThiago Macieira2018-12-181-0/+7
| | | | | | | Fixes: QTBUG-72599 Change-Id: I61ce366d57bc46c89db5fffd1570e578a7979749 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add an AVX2 code path to qustrchrThiago Macieira2018-12-181-0/+23
| | | | | | | The new loop does 32 bytes (16 code units) at a time Change-Id: I8f261579aad648fdb4f0fffd155412a4d77428e9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge some code to simplify maintenanceThiago Macieira2018-12-181-40/+49
| | | | | | Change-Id: I8f261579aad648fdb4f0fffd15541369e3625461 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Use the ptPaperSize information to set the paper sizeAndy Shaw2018-12-181-0/+2
| | | | | | | | | | In some cases the DEVMODE structure is not updated with the selected paper size, whereas the ptPaperSize structure is always set to the right paper size. Therefore we set the page size on the printer to this after the page dialog is shown. Change-Id: Ieafd486232aca6e930f73a8131b7196ddecea305 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QToolTip - set correct screen before resizeThorbjørn Lund Martsum2018-12-185-19/+34
| | | | | | | | | | | | | In order to get a correctly not truncated size we need the hint to be calculated based on the screen it is about to be shown on. This patch places some code in QWidgetPrivate that is used by QMenu and QToolTip + can be used to solve similar problems in the future. Task-number: QTBUG-72306 Change-Id: I58c058761f71b4a7675b6a078be62aa813ead752 Reviewed-by: Morten Kristensen <msk@nullpointer.dk> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QTableView: Fix keyboard navigation with disabled rowsChristian Ehrlicher2018-12-183-38/+125
| | | | | | | | | | | | | | | The keyboard navigation with MovePageUp/Down and MoveEnd did not honor disabled cells in all cases which lead to inconsistencies in the navigation (esp. since MoveHome does honor them correctly). Therefore make sure that all four move operations work consistent by refactoring the code to use common functions. Fixes: QTBUG-72400 Change-Id: I63fa3b626510d21c66f4f9b2b1bfb3261728ecaf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Luca Beldi <v.ronin@yahoo.it> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* configure: inline a few more testsOswald Buddenhagen2018-12-1718-383/+59
| | | | | | | | these were new on dev while the original migration happened on 5.9, or came from new changes which hadn't adapted yet. Change-Id: I5e48437061a97e6df6e93881c98471455e177631 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: inline corewlan testOswald Buddenhagen2018-12-173-49/+5
| | | | | | | we have support for objc++ since 591edbb11. Change-Id: I5f430fd7c410913d4532627d18529b077f794035 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: remove openssl placeholder sourceOswald Buddenhagen2018-12-171-6/+1
| | | | | | | | | there is no particular reason to exclude static builds from the default. misses are cheap now, so it's fine if nothing is found. this affects only the legacy pre-1.1 library names under windows. Change-Id: I998b9f7bfcce42ec990a236bb44372c4d6b3f631 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* configure: adjust openssl lib names on mingwOswald Buddenhagen2018-12-171-2/+5
| | | | | | | | | | | | | | | | both the mingw and msvc build have a "lib" prefix on the libraries. this makes the msvc build unconventional, so it needs an extra source. for the mingw build, otoh, this is the expected setup, so the source used for unix will work just fine. this doesn't fix any actual bug, because mingw will apparently resolve -llibfoo to libfoo.a even though only liblibfoo.a and libfoo.lib are documented (on mingw.org). however, this mix of conventions is ugly and should be avoided. Change-Id: I32b1621e4ac15db1f071c08ced738bfdafdcc11b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: optimize the openssl feature structureOswald Buddenhagen2018-12-171-5/+9
| | | | | | | | | | | | | | | don't run the openssl_headers test pointlessly when openssl-linked is selected but its test fails. implementing this cleanly required creating a separate openssl-runtime feature, including 'redirecting' the -openssl option (which is just an alias for -openssl-runtime) to it. simplify the openssl-linked conditions: while "anything but the value that enables it" in the 'disable' field effectively means "don't auto-detect it", it's better to be explicit about that. Change-Id: I6b117cc50711bb64d090fcfdb89ff009c60ed86c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: allow libraries to create explicitly empty testsOswald Buddenhagen2018-12-171-1/+1
| | | | | | | | this allows compile-testing the specified headers with no further tests. Change-Id: I268ff328deee221d9b92386fe2bd133b19a6f8e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: properly atomize xcb-syslibsOswald Buddenhagen2018-12-172-27/+107
| | | | | | | | | | as it is now cheap to test for individual libraries and headers, split the xcb_syslibs monster-library into its parts. the compile test remains a single blob, though, as that didn't get any cheaper. whether it's worth keeping it in the first place is debatable. Change-Id: Id7cae7925bb4d77069437512abecf14feea749f2 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* configure: detect fxc.exe more thoroughlyOliver Wolff2018-12-173-27/+31
| | | | | | | | | | | | | | | | When building ANGLE, we need the shader compiler (fxc.exe), which is not shipped with MinGW. Previously, we required an installed DirectX SDK. For Windows versions >= 8, the DX SDK is also part of the Windows Kit, so we also allow the user to specify the location of the Windows Kit. We also detect fxc on 64-bit hosts now, and in newer SDK versions which version the binary directory. The detected binary is now exported by configure, so the ANGLE project file does not need to duplicate the logic anymore. Task-number: QTBUG-52487 Change-Id: I41a17992909041dd84291b69498195cc8b8fab8a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: refactor directx checksOswald Buddenhagen2018-12-1710-66/+168
| | | | | | | | | | | | | | | properly atomize the libraries and express their dependencies, and adjust the project files accordingly. note that we don't try to use any additional paths, as all SDKs we currently support have built-in directx 11 support: - msvc2013 comes with win sdk 8.1; that is also used for win7 targets - mingw-64 5.3 (though this one is missing fxc, which is why the code path for using an external sdk for that remains) Change-Id: Ib44e389ef46567308293c2bbcad20a96e8ef70c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* configure: add "we mean it" blurbOswald Buddenhagen2018-12-171-0/+10
| | | | | | | | like all qt_*.prf files (exceptions prove the rule), the configure system counts as private api. Change-Id: Iea3057445e430029ecd8449e604e2d5c499ae10a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove specialized multi font engine on WindowsEskil Abrahamsen Blomfeldt2018-12-174-130/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This was added as a platform-specific implementation of the multi engine in 2005, before this code was generalized, and it currently only has the purpose of special handling loadEngine(). The way this was special handled was by creating a new QFontEngine for every fallback family *every* time, never checking if the font engine already exists in the cache (like the superclass implementation does). The result of this was that if you had 500 fonts and each of them had 500 fallback fonts, and made a loop that would load all of them, then you would get 250000 font engines. At some point before this, we would run out of available handles and crash. There shouldn't be any need to have special handling of fallback font loading on Windows (i.e. all the platform specific parts should go through the normal mechanisms in QPA), so lets just go through the superclass implementation instead. [ChangeLog][Windows][Text] Reduced the number of font engines that are created when loading new fonts, fixing crashes in some special cases where a large number of fonts are created during a short period of time. Fixes: QTBUG-70032 Change-Id: I05040dd458e820510685e8c6df8f31876d9bdb89 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* wasm: do not revise url of queriesLorn Potter2018-12-161-9/+1
| | | | | | | | | | | I think this may have been for some POST method form queries, but obviously was missing something. Task-number: QTBUG-72382 Change-Id: I59016776aeedf4b5599b3b44af70610babb0a61e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Ryan Chu <ryan.chu@qt.io>
* wasm: send mouse release to proper windowLorn Potter2018-12-162-11/+17
| | | | | | | | | | | | | | | | | When the mouse is released, it gets the current window to send the event to from the pointer position. If the release happens out of the browser viewport, that window is null and the release event essentially gets ignored. This change keeps the last known QWindow object to send the event to until the release. Also replace hardcoded emscripten events with enum names. Task-number: QTBUG-71948 Change-Id: I354d14479a43489f210cca31d6b9e0f65d083bb0 Fixes: QTBUG-71948 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Set point size, not just pixel size, when creating HarfBuzz fonts for shapingTor Arne Vestbø2018-12-161-0/+2
| | | | | | | | | | | | | | | | Otherwise HarfBuzz will fall back to using default font sizes, e.g. 12.0 in the CoreText backend. hb_coretext_font_create() already does the right thing, but we're not using that function, we create the hb_font_t ourselves in _hb_qt_font_create(). The mismatch didn't matter for vector-based fonts as the metrics (presumably) scale linearly, but for bitmap-based font such as Emojis they don't, and we ended up with advances that were way too large (increasingly so the larger the font point size). Change-Id: I4781dda965c745853732026da91590d8506ec3f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* nativewindow: Add additional test for 8pt font sizeTor Arne Vestbø2018-12-161-4/+3
| | | | | | Change-Id: I5012eb6ffee8f81da61a6fe611352ee5900a5eee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix clang LTCG config on WindowsYuhang Zhao2018-12-161-0/+8
| | | | | | | | | | | | | | To enable LTCG, clang-cl.exe need "-flto" instead of "-GL". But if you enabled LTO, the lib tool will have to change to "llvm-lib.exe" and the link tool also need to change to "lld-link.exe", because msvc linker will see these lib files as corrupted files. Leave QMAKE_LFLAGS_LTCG empty because lld-link doesn't need any additional parameters. Fixes: QTBUG-72402 Change-Id: Ia34d98bd1ad919d542ea3eac83944bf8c40ce0cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Remove "x" that was clearly a typoThiago Macieira2018-12-151-1/+1
| | | | | | | Or something I used for debugging. Change-Id: I61ce366d57bc46c89db5fffd15704e1d010749b6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* moc: add support for C++11 enum structSamuel Gaist2018-12-153-1/+13
| | | | | | | | | | | | | | | | | C++11 added the new enum class key as well as enum struct. While the former is likely the most known and used, the later can be used in the same contexts and with the same effects. Currently moc doesn't parse enum struct while it does for enum class. This patch fixes this. [ChangeLog][moc] moc now parses enum struct the same way as enum class therefore that keyword can be used with the Q_ENUM macro as well as Q_FLAG and Q_DECLARE_FLAGS. Change-Id: Iaac3814ad63a15ee4d91b281d451e786b510449c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix QRegularExpressionMatch capture-related documentationSamuel Gaist2018-12-151-1/+12
| | | | | | | | | | | | | The documentation is not explicit enough about the content of the returned list of capturedList nor the element 0 when calling captured or its friends. The first element (aka element 0) is the whole string captured when one or more groups are used. Change-Id: I3c59ebfc9f6d762dd4d8aaf8f5c0de24359f53d7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* QRegularExpression: anchor wildcard patternSamuel Gaist2018-12-154-43/+41
| | | | | | | | | | | | | | The current implementation of wildcardToRegularExpression doesn't anchor the pattern which makes it not narrow enough for globbing patterns. This patch fixes that by applying anchoredPattern before returning the wildcard pattern. [ChangeLog][QtCore][QRegularExpression] The wildcardToRegularExpression method now returns a properly anchored pattern. Change-Id: I7bee73389d408cf42499652e4fb854517a8125b5 Fixes: QTBUG-72539 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: verify header presence against sourcesOswald Buddenhagen2018-12-148-82/+125
| | | | | | | | | | | | | | | | | | | | | | | | in addition to the actual library resolution, also resolve the headers belonging to the library, to validate the include path, and possibly ensure that the right version of the library is present. the "include" entries were moved out of the "test" objects, and renamed to "headers". this cleanly permits libraries without compile tests. the headers were not put into the sources, because the variance among the includes is generally orthogonal to the variance among the libraries. note that this - like the library resolution - provides no support for darwin frameworks. consequently, the opengl libraries are excluded from the conversion on darwin. similarly, wasm is excluded (centrally), because emcc is magic and would need advanced wizardry to be dealt with. Change-Id: Ib390c75371efa2badcfec9b74274047ce67c3e5a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix warnings building with --std=c++11 and gcc 8Allan Sandfeld Jensen2018-12-143-5/+5
| | | | | | | Silence warnings about signed constants being shifted out of int range. Change-Id: I5dc397de71f4de09e54ce3cbc0f8e3a1cf977b03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Mark ICC 18 & 19 as warning-freeThiago Macieira2018-12-141-3/+4
| | | | | Change-Id: I052407b777ec43f78378fffd15311de83f978817 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
* Doc: fix null pointer passing to fprintfThiago Macieira2018-12-141-5/+7
| | | | | | | | | | | | | | | When these docs were written, the context.file and context.function pointers were never null. But in commit d78fb442d750b33afe2e41f31588ec94 (Qt 5.4), we made the logging pass null pointers in release builds. The C standard does not say that passing null pointers is permitted. In fact, it says "If no l length modifier is present, the argument shall be a pointer to the initial element of an array of character type." and that's pretty explicit that it needs to point to the initial element of a string. Fixes: QTBUG-72478 Change-Id: I4ac1156702324f0fb814fffd156f624ffefa1445 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* uic: Generate version check macros around newly introduced palette color roleFriedemann Kleint2018-12-141-1/+18
| | | | | | | | | | | | | Change ebd3a13b807c6af2684b42d3912549caf7ef82aa introduced a new QPaletter::PlaceholderText color role which causes the uic-generated code not to compile when using Qt Designer embedded in Qt Creator with older (5.9 LTS) kits. Generate a version check macro to fix this. Change-Id: I6d9f7edb0c6047c2f64ef3357b29f91655c52aac Fixes: QTBUG-72555 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Fix build with win32-clang-msvc and win32-iccFriedemann Kleint2018-12-143-8/+40
| | | | | | | | | | | | | | | | | | fbbe8aba9d70a3c13d1cd7797eb4dbbd1f05ade5 introduced a check for MSVC_VER to qmake, which is not set in win32-clang-msvc, causing the build to fail: Mkspec does not specify MSVC_VER. Cannot continue. Unable to generate output for: .../config.tests/verifyspec/Makefile Extract a minimal msvc-based-version.conf which determines MSVC_VER from QMAKE_MSC_VER for win32-clang-msvc and win32-icc. Task-number: QTBUG-63512 Change-Id: Ia6de8c4b1aae2ae1962cf4e60e3e6d51fdbbbabe Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qmake: don't misuse cache()Oswald Buddenhagen2018-12-141-2/+5
| | | | | | | | | | ... when QMAKE_DEFAULT_{INC,LIB}DIRS cannot be determined. it would have been nicer to actually persist empty results, but cache() won't do that, and fixing it doesn't seem worth the effort now. Change-Id: I95d5645e40a0da572f0def16462703373eaeb804 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: don't assign fallbacks for QMAKE_DEFAULT_{INC,LIB}DIRS in x-buildsOswald Buddenhagen2018-12-141-1/+1
| | | | | | | these cannot be possibly correct, and might mislead. Change-Id: Ie10531807978def04768e2429304949415cafb2a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: don't mess up linking order of librariesOswald Buddenhagen2018-12-141-2/+12
| | | | | | | | | | | | | | | | ... which are specified by full filepath, by making the de-duplication consistent with that applied to libs specified with -l, that is, last one wins. the problem existed "forever", but it became more visible after the recent configure changes. fwiw, Win32MakefileGenerator is not affected, because it has the opposite problem: it de-duplicates everything (including object files) in "last one wins mode". it might make sense to change that as well. Change-Id: Id7ef1d394fcc9d444450672c06a6f11af2b19eab Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 02:10:42 +0000