summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix qmake hash function to use XORRafael Roquetto2012-07-252-3/+3
| | | | | | | | | Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. Change-Id: I50b1a044eb827239dae1c04732ca6a065f6233b4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove support for rvct_linker config from MinGW generator againOswald Buddenhagen2012-07-241-11/+3
| | | | | | | | | yet another symbian remnant (building windows arm executables for the simulator). This reverts commit 5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1. Change-Id: I6eb147c0e2710eba09a4339fa4a08a5b08f8dab3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* $$QMAKE_LIBDIR contents belong into $(LIBS), not $(LFLAGS)Oswald Buddenhagen2012-07-241-3/+3
| | | | | | | | unlike for the unix linker, this does not matter for the windows linker, but keeping it consistent has advantages. Change-Id: Ib9b9efa18c31d87c026d3cac5a8737f4612ad1c0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* dispose of MSVCPROJ_LIBSOswald Buddenhagen2012-07-247-39/+15
| | | | | | | | | | | | | | | this way QMAKE_LIBS{,_PRIVATE} can be treated the same as in all other generators, which allows us to: - make the windows generators' findLibraries() be more like the unix version - dispose of QMAKE_INTERNAL_PRL_LIBS handling while reading prl files (because the output always goes to QMAKE_LIBS) - as a side effect, QMAKE_LIBS_PRIVATE are not subjected to prl file resolution any more, which is again consistent with unix - the correctness of that needs to be assessed separately. Change-Id: Ie9bc04d117eff6a7cde846677f98acf3c64aa6ee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* remove apparently pointless call to findLibraries()Oswald Buddenhagen2012-07-241-1/+0
| | | | | | | | | | | the function was already called long before. if it really needs to be called again, it's a) probably affecting the other windows generators as well and b) the actual problem should be fixed instead. This reverts commit d50c3c6624b2343e42d0df4b72212d9ced8f3682. Change-Id: Iaa2007640fbc9acdc50ba3b0681efeb0d184f224 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* use QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIROswald Buddenhagen2012-07-181-1/+4
| | | | | | | this is what this code assumes anyway Change-Id: I667412b101c18325321a568cc22d25ef07418ffb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove QTDLL_POSTFIX stuffOswald Buddenhagen2012-07-182-11/+2
| | | | | | | | | the libinfix provides a way cleaner solution to that. i don't expect it to be still actually used anyway. Change-Id: I051522ec3abb3d92c529b5462b8514a706aa2ba1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* automatically fix separators in QMAKE_{DIST,}CLEANOswald Buddenhagen2012-07-163-4/+15
| | | | | | | it's a tad insane to expect the user to do that Change-Id: I75c68f2a28656c9ba2e3fabcc79718b899b29ce7 Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* fixed ce makefileenvironmentBjoern Breitmeyer2012-07-061-3/+1
| | | | | | | | XQMakeSpec is not available after configure but the QMakeSpec contains the correct value Change-Id: I6cd4da8b0d6c95565f31842c17611ffd361bc010 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* ifdef out the "clears variables previously set" warningOswald Buddenhagen2012-07-061-0/+2
| | | | | | | | it produces way too many false positives to be useful. Change-Id: Iefa423f96fa5574267b1468abb5efc8454ab54a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't use a different de-duplication algo for the library list in mingw prl ↵Oswald Buddenhagen2012-07-052-17/+0
| | | | | | | | | | | | | | files i have no idea why that was done (the commit message says "not sure why it works elsewhere"), but it makes no sense whatsoever, specifically doing it only on mingw. probably some workaround, as usual. the de-duplication is broken by design anyway. This reverts commit 7a6302c2baf6861fdaf65992b71a7676859860c2. Change-Id: I6edecaa062570e59eccd24d50919ba132e65a403 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Uppercase the CONFIG for verbatim mode.Stephen Kelly2012-07-041-1/+1
| | | | | Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* export QMAKESPEC to the projectOswald Buddenhagen2012-07-031-0/+1
| | | | | | | | | | this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: improve the .pc files generatorKonstantin Ritt2012-07-031-3/+1
| | | | | | | | Don't hardcode the "qt_config" EXTRA variable and use QMAKE_PKGCONFIG_VARIABLES instead. This allows qmake create the .pc files that are unrelated to Qt. Change-Id: Ic72005e8819a15f6c50f3aaf79424a247fba20af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: remove support for X.sources in DEPLOYMENT variablesJoerg Bornemann2012-07-031-3/+2
| | | | | | | | | | This has been deprecated in Qt 4.8.0. Use X.files instead. Task-number: QTBUG-3216 Task-number: QTBUG-25106 Change-Id: I581321591291118a13403e92da5997497e12c3fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix bugs surrounding reading super cache when no local cache is presentOswald Buddenhagen2012-06-301-3/+2
| | | | | | | | we would ignore the early read variables and fail to export the super cache's path to the project. Change-Id: I3c467802b4af22f73be05b25dbd8ccb6196d28a8 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Merge branch 'buildsystem' (second round)Oswald Buddenhagen2012-06-2925-841/+465
|\ | | | | | | | | | | | | | | | | refactoring and cleanup. fixes x-builds between different os families. Conflicts: mkspecs/features/qt.prf Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91
| * remove abuses of warn_msg()Oswald Buddenhagen2012-06-271-2/+0
| | | | | | | | | | | | | | | | this function is not meant to be used for debug statements Change-Id: I84575e64814e2c9fd2e09c33fc680d0e6648f4ea Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * remove support for versioning qmake propertiesOswald Buddenhagen2012-06-272-61/+17
| | | | | | | | | | | | | | | | | | the rationale is mostly the same as in 568e714fdf, plus the additional point that the qmake version didn't change for a decade. fallback paths for version 2.01a properties are provided. Change-Id: I3d3f16595eca9eca71c78fda9dbaf53da9f874a9 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * use source root also for finding featuresOswald Buddenhagen2012-06-271-0/+2
| | | | | | | | | | Change-Id: I108914c6d2c6d06414156584aeb3a1afb0f5838d Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * move cachefile_depth calculation out of project evaluatorOswald Buddenhagen2012-06-273-5/+8
| | | | | | | | | | | | | | it has no business there Change-Id: I6d1a4b55b5acacc470cc109a6c69a907abbba312 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * remove possibility to request project recursion from within a pro file againOswald Buddenhagen2012-06-276-25/+11
| | | | | | | | | | | | | | | | | | | | the feature was implemented for the abld/sbs2 generators only, and is of course undocumented. this reverts most of commit e795e61ef93f8080f9938ac49f2fca306644af85. Change-Id: Ibd1726b036ce6c45f8e678ea996218f774f8aed2 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * dispose of Option::host_modeOswald Buddenhagen2012-06-272-21/+4
| | | | | | | | | | | | | | | | | | it was used only for determining the path separator, so do that directly. the -macx option went bye bye, as it is redundant with -unix now. Change-Id: Ib8344c042db56e05af75d263447311d4b43a3bf0 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * dispose of Option::shellPathOswald Buddenhagen2012-06-273-4/+1
| | | | | | | | | | | | | | use isWindowsShell() in the one remaining case. Change-Id: I25eab398ef50df5a7f4ec808279b83ca900e3c58 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * assume windows shell iff dir separator is backslashOswald Buddenhagen2012-06-273-11/+1
| | | | | | | | | | Change-Id: I411a4d6691e18b818ee7d1ced7f126f97af0902f Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * reduce a bit of code dupe while assembling feature search pathOswald Buddenhagen2012-06-271-13/+9
| | | | | | | | | | | | | | | | instead of having a bunch of nested loops, collect into a temporary list and process it at the end. Change-Id: I97e5642f7e13f7c7b69eae00833e61cdf46a02ed Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * purge "dumping all variables" debug loopsOswald Buddenhagen2012-06-273-31/+0
| | | | | | | | | | | | | | | | | | the as-we-go dump is sufficient (and usually necessary to actually find the problem). if only the summary is interesting, the -E option can be used now. Change-Id: I9e34c6db9dcb99b38013c4d0cb80b8cb88ca36b5 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * repurpose deprecated -E switchOswald Buddenhagen2012-06-274-15/+23
| | | | | | | | | | | | | | | | | | instead of dumping the variables as we are going, dump everything at the end. this is potentially useful, as opposed to the previous functionality which was redundant with -d. Change-Id: Icf14703cb93e03f7079dfc0266b219ad9c902133 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * make a bunch of functions constOswald Buddenhagen2012-06-272-7/+9
| | | | | | | | | | | | | | values() and variables() get both const and non-const overloads Change-Id: Idfabea1acc488bf78f24edb831681ee07f0074c4 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * const correctness for variables()Oswald Buddenhagen2012-06-274-7/+7
| | | | | | | | | | Change-Id: Id11453ccbae3ffa32580badadada945d342d727a Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * don't overuse variables()Oswald Buddenhagen2012-06-276-49/+49
| | | | | | | | | | Change-Id: Ib2da88e5e29c0bfecc39a9c06e82a34a4bd0b1e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * make magicValues() constOswald Buddenhagen2012-06-272-7/+4
| | | | | | | | | | | | | | the weird debugging feature is not used anyway Change-Id: I07f481a94f2b2ab2a5b61270f0e00183cefd4cd1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * const correctness for values() callsOswald Buddenhagen2012-06-2711-99/+103
| | | | | | | | | | Change-Id: I1476ae8d3fb7364686398c5650729dee94a8e933 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * don't use backwards compat mapping for generator accessesOswald Buddenhagen2012-06-272-16/+7
| | | | | | | | | | | | | | | | we can rely on only user code needing variable mapping, so apply it only in the evaluator. Change-Id: I6fc58e7bcf24cf0fa8783d5341ab1e7b9f001c88 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * introduce magicValues() functionOswald Buddenhagen2012-06-272-2/+9
| | | | | | | | | | | | | | | | | | the only place where the two remaining magic values need to be referencable is doVariableReplaceExpand(), so make a separate function and use it only in that place. Change-Id: I6e2fcfa3a4f16727d90ace56eb88fc99ef272ffc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * make $$PWD non-magic on readOswald Buddenhagen2012-06-271-4/+3
| | | | | | | | | | | | | | like the other variables, we can just store it in the hash. Change-Id: I49ad39dca8d498119b27f16ea4bdc44ae698d72e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * set $$_DATE_ only on project startupOswald Buddenhagen2012-06-271-3/+1
| | | | | | | | | | | | | | | | | | this changes the semantics a bit - it will be the datetime of qmake startup rather than the time a particular file is processed. i'd argue that this is insignificant. Change-Id: I75918967bef25038ce54aa81ab03c027384c0268 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * deprecate $$IN_PWDOswald Buddenhagen2012-06-271-2/+3
| | | | | | | | | | | | | | | | it suggests a symmetry to $$OUT_PWD which simply isn't there. the shorter alias $$PWD is much more popular anyway. Change-Id: Iefbfd56f1a3e526f15c9d6cd1bf59778be6f2f8d Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * make project-related variables non-magicOswald Buddenhagen2012-06-271-11/+5
| | | | | | | | | | | | | | | | $$_PRO_FILE_, $$_PRO_FILE_PWD_ and $$OUT_PWD can be cleanly initialized. no need for magic. Change-Id: I2e339d17bae42ecb573c2f82c716f6be15a35b98 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * move initialization of $$TARGET to setupProject()Oswald Buddenhagen2012-06-271-4/+2
| | | | | | | | | | | | | | that's what we have it for Change-Id: Ib734b97d337a82c73b086dfeb2b263171f2a02b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * make $$TEMPLATE magic on write instead of on readOswald Buddenhagen2012-06-272-16/+27
| | | | | | | | | | Change-Id: I03a68993dd7d4488f8212132a9d492d135295b9e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * make a bunch of invariant variables non-magicOswald Buddenhagen2012-06-273-127/+112
| | | | | | | | | | | | | | | | instead of resolving them on-demand, just initialize the value hash with them. less magic and faster. Change-Id: I28cb6c21ae6ae60a33734f62acdef0794420ba8f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * don't make $$TEMPLATE_PREFIX available any moreOswald Buddenhagen2012-06-271-4/+0
| | | | | | | | | | | | | | | | this is a purely internal variable. projects are supposed to query $$TEMPLATE only. Change-Id: I32a3aa7012a4fedcf6e77e2e1302ed978baac700 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * move initialization of numerous variables to spec_pre.prfOswald Buddenhagen2012-06-272-85/+14
| | | | | | | | | | | | | | | | this is cleaner by design and allows removing some hacks. Change-Id: I3270195b5d62caa476ffde7c1e1ef43cec99c565 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * remove QMAKE_EXT_H_MOC and QMAKE_CPP_MOD_MOC from OptionOswald Buddenhagen2012-06-272-10/+0
| | | | | | | | | | | | | | | | these are not actually used inside qmake since ever the code was factored into moc.prf. Change-Id: I545f4857ca3f0b4bf2439703700069ac67ad4ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * purge QMAKE_MOD_SYSTEM_ENV from Option & co.Oswald Buddenhagen2012-06-272-5/+0
| | | | | | | | | | | | | | this is entirely unused Change-Id: Ia0368b1d90f61b64178e28479a2088a19aa418e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * don't read QMAKE_DIRLIST_SEP back into Option::dirlist_sepOswald Buddenhagen2012-06-271-2/+0
| | | | | | | | | | | | | | | | it's really only a host setting which is not used any more past the now removed assignment. Change-Id: I62c61c893697eb9a7e7be550311bf152d5a8206e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 23:02:02 +0000