summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix/unixmake.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* remove handling of QMAKE_FILETAGSOswald Buddenhagen2012-09-031-7/+0
| | | | | | | | it was unused for a decade. and broken, of course. Change-Id: I9713d595d95c5b074ef96dfe9b1c314b9198bd7e Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* micro-optimize: use POD-initializable lists of variable namesOswald Buddenhagen2012-08-281-10/+10
| | | | | Change-Id: I3732fef509b358949ef90002dbfc1960360afef8 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* remove dead variable assignmentsOswald Buddenhagen2012-08-281-1/+0
| | | | | | Change-Id: I032e9116ca1b7250497f56ea26103f2173f0fc09 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* findLibraries(): don't remove -L options for system pathsOswald Buddenhagen2012-08-041-1/+2
| | | | | | | | | the paths may be explicitly added before some other paths, so it would be wrong to remove them. Change-Id: I68ae93fd307afe14a07a0f24de952783950b5bea Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* run processPrlFiles() over QMAKE_LIBS_PRIVATE as wellOswald Buddenhagen2012-07-311-1/+1
| | | | | | | | | | | | there is no reason why private libs should not have prls resolved. the two variables are resolved independently, so it's possible that (even more) libraries will appear duplicated on the linker command line, but that seems easiest for the time being. Change-Id: I9070ba53808a0661fa72949db8111106b7aca487 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make the windows prl processing more like the unix variantOswald Buddenhagen2012-07-311-9/+0
| | | | | | | | it's more elegant, and more similar code is better. Change-Id: I2b8b036cb70a932fd171e23cf7d3389188401924 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* do not look for frameworks in library pathOswald Buddenhagen2012-07-281-3/+2
| | | | | | | it's just wrong Change-Id: Ia21e9fb7e67623d6c4f70eab1f76360624ba314b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* insert explicit library search paths before system search pathsOswald Buddenhagen2012-07-281-4/+6
| | | | | | | | ... as the linker does. Change-Id: I4a030d9e2f281b892b78ba25b11f6df6b0893712 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* look into /Library/Frameworks as well in processPrlFiles()Oswald Buddenhagen2012-07-281-0/+1
| | | | | | Change-Id: I445b9d1d3cd349eb7981b1aec824e6878b0c16e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* unify default search paths between findLibraries() & processPrlFiles()Oswald Buddenhagen2012-07-281-0/+2
| | | | | | | | i see no reason why they should deviate Change-Id: Iaa0445b79a95d348f51df74a74c7c89216c468ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix lookup of libraries with a full path but without extensionOswald Buddenhagen2012-07-281-2/+3
| | | | | | | | | given that nobody noticed so far how broken this was, this doesn't appear to be a particularly common path. but anyway ... Change-Id: Ic17b239d724a4d69ff414a24be2e8588732bc8dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't actually resolve frameworks in findLibraries()Oswald Buddenhagen2012-07-281-16/+4
| | | | | | | | | | | the code wouldn't actually *do* anything with them, because it was completely broken. didn't seem to hurt, so just remove it. we still need to parse -framework, though, so we don't do funny things with its possible argument. Change-Id: Ia3266538612d3314a72f4965ee9c1ea2d3046ac9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* dispose of QMAKE_LIBDIR_FLAGS, "demote" QMAKE_FRAMEWORKPATH_FLAGSOswald Buddenhagen2012-07-271-4/+8
| | | | | | | | | | | merge their content as early as possible into QMAKE_LIBS. that's where they ultimately end up anyway, and this approach is way simpler. QMAKE_FRAMEWORKPATH_FLAGS is also used for the compiler flags, so it remains as such in this second function. Change-Id: Idc3ba4a9b2569fce3252d5f5ddc3f6ebf93650cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove duplicate -L flags in findLibraries()Oswald Buddenhagen2012-07-271-3/+7
| | | | | | | | unlike duplicated -l options, duplicated -L options are really redundant. Change-Id: I4fa42d8ee2f10c6e6263457d9bb97291e13685ef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* unify handling of non-standard linker -L flagsOswald Buddenhagen2012-07-271-11/+16
| | | | | | | | | findLibraries() now consistently expands to the linker-specific syntax, and processPrlFiles() expects that syntax. Change-Id: Ifd7b51d01378c91d6f2b132aca33629f21ca72f9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* do not run findLibraries() over QMAKE_LFLAGSOswald Buddenhagen2012-07-241-2/+2
| | | | | | | | libraries and related flags have no business in that variable, by definition. Change-Id: Ic958a3e082a498945ab56bc12ec05d4083ee43a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* remove another symbian remnant: QMAKE_RVCT_LINKSTYLEOswald Buddenhagen2012-07-121-7/+2
| | | | | Change-Id: Ibac060ecae061c72d4c7076b2d61a5cdd6247420 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make the prl lookup search in standard locationsOswald Buddenhagen2012-07-121-0/+2
| | | | | | | | | | | | qtAddModule() skips adding standard library paths to LIBS. however, as processPrlFiles() didn't know anything about that, it would not find the prl files of qt libraries in these paths. so centralize the definition of these default paths (we should actually ask the linker for them) and use it in both places. do the same for the include paths for symmetry. Change-Id: I7e3692dc2d1c2d0c97a9151d15887b1263de137a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* const correctness for values() callsOswald Buddenhagen2012-06-271-1/+1
| | | | | Change-Id: I1476ae8d3fb7364686398c5650729dee94a8e933 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* revamp handling of qmake target modeOswald Buddenhagen2012-06-271-10/+9
| | | | | | | | | | | the project evaluator becomes oblivious of the target mode. the mode is set up in spec_post.prf according to the spec. $$QMAKE_TARGET contains the feature suffixes to search, and is also contained in $$CONFIG. the target_mode variable itself becomes private to the Makefile class. Change-Id: I3c06d9dab536b753343cec6c5c491d3203e50bd8 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* make 'qmake' target of SUBDIRS projects non-recursiveOswald Buddenhagen2012-06-191-2/+0
| | | | | | | | | that's consistent with other projects. 'qmake_all' can be used for recursion. Change-Id: Ie6d620f7a3e0e28d3f2f82f01ca94c2f46137c68 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmake: remove symbian supportJoerg Bornemann2011-11-071-3/+0
| | | | | Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-241-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+925
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-12 14:54:06 +0000