aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/qtmoduleinfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* libqbsqtprofilesetup: Get rid of bogus warnings about missing prl files.Christian Kandeler2014-10-061-16/+39
| | | | | | | | | | | - Don't look for debug libraries in a release-only Qt (and vice versa). - Some libraries are never built as debug libs. - On Darwin, some modules are not frameworks even in a framework build. This also fixes a bug setting up plugins of a static Qt build. Change-Id: I7e6c1e06070897982fdb9b12930bd7f75ae620b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Fix mingw use case.Christian Kandeler2014-09-291-3/+7
| | | | | | | | | | | | - Don't assume the mkspec has "mingw" in its name. - Relax overly pedantic tests in gcc.js: If a library name is an actual file path, then use it as one, regardless of what it looks like. - Some autotest adaptations. Task-number: QBS-688 Change-Id: I1d0d51b04ae81d4c10f8cdcc18d6447233e44863 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qt profile setup: Fix Qt 4 case on Windows.Christian Kandeler2014-09-241-3/+13
| | | | | | | | | The version number is not considered part of the base name there, which breaks our assumptions. Task-number: QBS-689 Change-Id: I628d0e8da642c2aa68af06d1413826e0d2425749 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qtprofilesetup: Read qt_lib_*.pri files recursively.Christian Kandeler2014-08-291-4/+27
| | | | | | | They can contain "include" statements, apparently. Change-Id: Idc67b7b58c909bdca3ebb2efdf11ee33f06b0b9b Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* qtprofilesetup: Refactor qt_lib_*.pri file reading.Christian Kandeler2014-08-281-7/+11
| | | | | | | | Move this functionality to a dedicated function. It will get more complex in a follow-up patch. Change-Id: I541abbf8e8ffa05190980179ecb0919184f130eb Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* libqtprofilesetup: Read prl files also for Qt 4.Christian Kandeler2014-08-201-33/+42
| | | | | | | | | If we don't do that, nothing will work, because the qbs modules' libFilePath property won't be set. Independent of that, it's the right thing to do. Change-Id: Ifa946281fd0e7b045bbd30bd166e661cabce7c1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Complain only once per missing prl file.Christian Kandeler2014-08-201-5/+10
| | | | | | | | The message currently appears up to four times per file, which is annoying. Change-Id: I96b7192d81fd0fc9a70903d695b7c000cfef1807 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Link Qt libraries as full file paths.Christian Kandeler2014-08-201-2/+47
| | | | | | | | | | | | | | | | That is, give the full file path to the linker instead of using the -L/-l combination that can pull in the wrong version of a library if one is installed e.g. in /usr/lib. For this purpose, the patch does two things: 1) In each Qt module file, add the file path of the respective library to cpp.{static,dynamic}Libraries instead of the base name. 2) When reading Qt's prl files, check in all occurrences of "-l<lib name>" whether <lib name> matches a Qt library and if so, replace <lib name> with the full file path to the library. Change-Id: Ic02633ae7f820bd2365f8e510f7c16f73d93e584 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix preprocessor defines list in Qt profile setup.v1.3.0Jake Petroules2014-08-151-1/+1
| | | | | | | For example, now gives the correct QT_GUI_LIB instead of QT_QTGUI_LIB. Change-Id: I8f77d5f32ed613b6a4b0dfac845e3f582c1db90d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove special ActiveQt case from moduleNameWithoutPrefixJoerg Bornemann2014-07-171-3/+3
| | | | | Change-Id: I03f52f26fe8b8b657177d7a3128231619788ebb2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* rename QtModuleInfo::moduleName to moduleNameWithoutPrefixJoerg Bornemann2014-07-171-1/+1
| | | | | | | ...because that's what it returns. Change-Id: Ie0c8f27ea1d6b686fc1f825dbc8b42c56f1a7b68 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix library names for Qt4 ActiveQtJoerg Bornemann2014-07-171-1/+1
| | | | | Change-Id: I906b5642a9285d9db47fe7230743f02b2a264413 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix setup-qt for modules without libsJoerg Bornemann2014-07-141-0/+2
| | | | | | | The convenience module Qt.test got libraries assigned that do not exist. Change-Id: I9fa5d1d67ce9f540c0d0f70ae3d0921c37dad7b3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* init QtModuleInfo::isPlugin properlyJoerg Bornemann2014-07-141-1/+2
| | | | | | Change-Id: I8e28983e7d74d3196ea1a0c89a7d9a52949b44fe Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* libqtprofilesetup: Gather information about Qt plugins.Christian Kandeler2014-07-111-5/+35
| | | | | | | | And create modules for them. These also handle the creation of the "import" source file when building against a static Qt. Change-Id: I883a1dd96c5e38c9d4bb5c13af807b1bf388f8b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Set up ios-specific flags at setup time.Christian Kandeler2014-07-081-6/+18
| | | | | | | | This enables us to get rid of qtfunctions.js. Change-Id: I4cf593742f7afcfb9caa8e2984b11b80d4fb6265 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qtprofilesetup: Determine Qt module library name at setup time.Christian Kandeler2014-07-071-0/+8
| | | | | | | | As opposed to calculating it in JavaScript inside the module. Change-Id: I4d11d57a45098d7f8ac06cf60f8d8cab8b11feab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Take prl files into account.Christian Kandeler2014-07-041-0/+103
| | | | | | | | | | That is, extract libraries, frameworks and other linker flags from QMAKE_PRL_LIBS and add set the respective properties in qbs' Qt module files accordingly. Task-number: QBS-618 Change-Id: I404a3c07af6fdebb8e2862fefd5696aada7a58e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Split up qtprofilesetup.cpp.Christian Kandeler2014-07-031-0/+337
It's gotten unruly. Move QtModuleInfo into its own set of files and move some code into new member functions. Also move the module list generators into that file. Change-Id: If87269cc509c730084257ac4f254def529e43b5b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 13:32:23 +0000