aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Fix handling of minimum Windows version and subsystem linker flags.Jake Petroules2013-04-123-25/+45
| | | | | | | | | | | | | | | | | | | | | | Both MSVC and MinGW now only pass their respective subsystem flags if product.consoleApplication is not undefined - the linkers use console by default. MSVC: as an exception to the above, a subsystem flag must be passed regardless of the value of product.consoleApplication if a minimum system version was specified - in this case subsystem will be set to console. MinGW now correctly handles setting the minimum subsystem/OS version; it was previously using totally nonexistent flags due to poor assumptions about its MSVC compatibility. The test case which tests this functionality was also broken, and is now fixed as well. Task-number: QBS-244 Change-Id: Ibca29ce673a81f1231d364d5b6e6875a462b379c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qmFilesDir for iOS.Jake Petroules2013-04-121-1/+1
| | | | | Change-Id: I5e63482c25233dd92b1e8e8dc5442b7a04ba1128 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Check for Darwin in general rather than merely OS X, where appropriate.Jake Petroules2013-04-122-2/+2
| | | | | | | All usages of Darwin, OS X and iOS checks in QBS should now be correct. Change-Id: I81f38bb6e73bc160bce89597e70e89ce76eaccd2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* setup-qt: detect static Qt buildsJoerg Bornemann2013-04-101-0/+1
| | | | | | | qt.core.staticBuild will be set to true for static builds. Change-Id: I9e316eccacb43982ac616377642ac73d530596c8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add support for QtWebkitWidgets module.Christian Kandeler2013-04-081-0/+10
| | | | | | | New in Qt 5. Change-Id: If1c671a2ba24a6c48bae64027da8331a2a8043fa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make use of Rule.condition in dSYM ruleJoerg Bornemann2013-04-051-7/+1
| | | | | | | | | Instead of creating a fake command we turn the rule off if buildDsym is false. Change-Id: I4e436b88010df7bbc6b1cd0c164223f94db793b8 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add rules for qhp and qch file generation.Christian Kandeler2013-04-031-0/+73
| | | | | | | | | Since qdoc works in a rather idiosyncratic way, we have to introduce special properties for the output file name as well as the process environment. Change-Id: I3797b3bf393b14c8a9bc671c56f0185515f8ef3f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add iOS module and move OS X/iOS common code to DarwinGCCFawzi Mohamed2013-04-025-32/+271
| | | | | | Change-Id: I2fea6a7eddd599c70336f351b6814bfe335edd79 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix refactoring artifact in gcc.jsJoerg Bornemann2013-03-261-1/+1
| | | | | | | | | Long live the comma operator! Task-number: QBS-240 Change-Id: I0074dec7a0a9457a4c21f239bff2a1ed1373f649 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove Product.destination in favor of Product.destinationDirectoryJoerg Bornemann2013-03-251-1/+1
| | | | | | | | | Product.destination in product context was visible as product.destinationDirectory in rule context. Now it's destinationDirectory in all contexts. Change-Id: I20173a1543036221491467a3d0ca44f0cf017c83 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Default to applicationbundle for iOS as well.Jake Petroules2013-03-251-1/+1
| | | | | Change-Id: I598432b664b16f6da2b1d5a9030d78fd3e29db1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* change values of qbs.endiannessJoerg Bornemann2013-03-221-0/+7
| | | | | | | | | | The valid values for the endianness are now "big", "little" and "mixed". Task-number: QBS-236 Change-Id: I710f2e1b7d1e5c71471d51519dff3e15aeb4b829 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Improve iOS toolchain detectionFawzi Mohamed2013-03-213-7/+20
| | | | | | Change-Id: I4f82e4aa39d34834a4d90f2301fb865345f2ce8b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for setting the minimum operating system target version.Jake Petroules2013-03-206-17/+148
| | | | | | | Task-number: QBS-226 Change-Id: I85c6e24ecfe6b90d33df17589f151e4082b53d58 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Determine if Qt is a framework build in setup-qt.Jake Petroules2013-03-201-1/+1
| | | | | | | Task-number: QBS-184 Change-Id: I0c1f5e31d6b61a64c5592ccaa5e08049ca9f65a2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Actually put some items into the Info.plist (and upgrade to v1.0).Jake Petroules2013-03-191-3/+11
| | | | | Change-Id: I299c379e3658d6e5b527dc1555ba0239430c330c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Place the executable in the application bundle directly.Jake Petroules2013-03-192-7/+6
| | | | | | | | | | | | | As a side effect, this fixes installation of application bundles (the entire .app directory is copied, not just the executable). The prepare command remains in the applicationbundle Rule to let the user know that an application bundle has been generated, though it performs no actions other than printing that message. Task-number: QBS-186 Change-Id: I61c5d5c3fb6e64251026a346a688563546426dbb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce properties for platform-specific compiler flagsJoerg Bornemann2013-03-183-10/+36
| | | | | | | | The platform*Flags properties are intended to be set by the toolchain setup and are prepended to the corresponding user properties. Change-Id: I417c8210bfe2a091f3df5077002300d9c9e9ac7f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* introduce property cpp.objcxxFlagsJoerg Bornemann2013-03-182-0/+12
| | | | | Change-Id: Idd56c140b7c85a731421d9e284341f435f097cca Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* simplify language selection in GenericGCC.qbsJoerg Bornemann2013-03-181-25/+14
| | | | | | | | Preparation for objcxxFlags. Change-Id: I8fbe71fa1a26db4fa034cd622a0a9bd0b0ae1998 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* move cpp.compilerName to the module's base itemJoerg Bornemann2013-03-182-1/+2
| | | | | | | | Otherwise we get an error if we set cpp.compilerName and the inheriting module does not know about it. Change-Id: I328cb48ac002ec20cc6996ab5b99fed6215c5b49 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix directory names for application bundle artifacts.Jake Petroules2013-03-181-3/+3
| | | | | | | Task-number: QBS-230 Change-Id: I8c094ad9f5d70114f53b9676e237f423b81566a2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove share.pri.Christian Kandeler2013-03-121-3/+0
| | | | | | | | The contents of share/ is already handled in static.pro for copying to the build directory, to put the installation stuff there as well. Change-Id: I285a62ea93a2d2ee9332b4533409ffe4517a781d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add the input file's extension when generating .o filenames.Jake Petroules2013-03-122-3/+3
| | | | | | | | | | | | | | | Old behavior (conflict): main.cpp -> main.o main.mm -> main.o New behavior (no conflict; same behavior as CMake): main.cpp -> main.cpp.o main.mm -> main.mm.o Task-number: QBS-211 Change-Id: I27c71ffe368a2191c56fc0fc34089a6ad7ec8f61 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for -iframework (like -isystem but for frameworks).Jake Petroules2013-03-113-6/+15
| | | | | | | | Task-number: QBS-198 Change-Id: I61f1504744e35cf931eb41a5de54c8dd7b7690dc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix linking of staticlibrary products with MSVCJoerg Bornemann2013-03-111-1/+1
| | | | | | | Task-number: QBS-193 Change-Id: Ifcae8e2d47dff88c30d7f214bf9aef16ee02b1f1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* use the simplified base import statementJoerg Bornemann2013-03-0838-38/+38
| | | | | Change-Id: I3c9e5d5512cad7028026d6166a0783fd507e7826 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove superfluous version numbers from import statementsJoerg Bornemann2013-03-087-8/+8
| | | | | Change-Id: I977081507fcdd60a94a8cfc8fde884984fb6cf13 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* slash the Loader's Gordian KnotJoerg Bornemann2013-03-071-2/+0
| | | | | | | | | | | | Split Loader into ItemReader, ModuleLoader and ProjectResolver. Get rid of our three QScriptClass derivatives and replace them with one, named EvaluatorScriptClass. The complete knowledge about the project structure is held by a tree of Item objects that are independent of QScript* objects and thus are prepared to be serialized. Change-Id: I53e23426d55e7de9cec6f9f29da55fb9c4704d71 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Provide the ability to weak-link frameworks on OS X.Jake Petroules2013-03-043-3/+12
| | | | | | | Task-number: QBS-200 Change-Id: If2530b687bef6e4cbea1e5947016e4e7b72993c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix import in mac-gcc.qbsJoerg Bornemann2013-03-011-0/+1
| | | | | Change-Id: Ic11b90775ba71377cc8e014956a7e3b99bc46a5a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Rename ModUtils::findFirst() and ModUtils::appendAll().Christian Kandeler2013-02-2810-125/+125
| | | | | | | | | The new names are "moduleProperty" and "moduleProperties", respectively. These express much better what the functions do and also match their C++ counterparts. Change-Id: I7f97f4b861f3ae58813377da593bc3b82be78bd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Install the plugin libraries and share/qbsAlejandro Exojo2013-02-221-0/+3
| | | | | | Change-Id: I003f991cb143de6af87a7b9a058cbb41efcbf50e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove unused variables from msvc.jsJoerg Bornemann2013-02-211-6/+0
| | | | | Change-Id: Idc7cf03881f2c424a0c13dbadef6a5cdba068262 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* MSVC: fix manifest resource id for DLLsJoerg Bornemann2013-02-211-1/+1
| | | | | Change-Id: I18baddd6813376a655136ed82ba76fce05da1c41 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* MSVC: fix incremental linkingJoerg Bornemann2013-02-211-7/+15
| | | | | | | Task-number: QBS-214 Change-Id: I250b4169733a91df7dac3a8e8cfc95cf42793b3d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Move property look-up into the C++ backend.Christian Kandeler2013-02-2010-139/+113
| | | | | | | | | | | Instead of exporting the complete property VariantMap of products and artifacts to JavaScript and finding the property values there, we introduce functions that do this in C++ and just export their functionality. This functionality will also be made available in the API. Change-Id: I6b8631e78b74db563403caa47ae10021ca152fa0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix Moc.args().Christian Kandeler2013-02-202-6/+6
| | | | | | | | | A file name was misinterpreted as an artifact. This patch fixes that and also makes sure it won't happen again by renaming the function parameters accordingly. Change-Id: I0ea763a0c9735c12829223dde31a9d59361f730d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add missing import in CppApplication.qbsJoerg Bornemann2013-02-151-0/+2
| | | | | | | The current loader implementation accidently accepts this. Change-Id: I469b7c4b9f1761c6e0cbb8089095cde5138709f1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Allow custom name for the lrelease tool.Christian Kandeler2013-02-081-1/+2
| | | | | | | It's not necessarily "lrelease" on all platforms. Change-Id: Iac00bb0a9dec22e0e1e127eeda60b124df1a3031 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the qbs.platforms property a bit more generic.Christian Kandeler2013-02-081-7/+5
| | | | | | | | The target OS can now have an arbitrary value and automatically introduces a platform of the same name. Change-Id: I36db932f9d46460a2badaa0b04dce6b73d8407fd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Better support for non-Linux, non-Mac Unixoid systems.Christian Kandeler2013-02-062-2/+6
| | | | | | | Let's not exclude them for no good reason. Change-Id: I09ba989d5573383be8f7c5d88eaf44317b268695 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow non-standard names for Qt tools.Christian Kandeler2013-02-063-4/+15
| | | | | | | | This is needed for distributions that name their binaries e.g. "qmake-qt4" etc. Change-Id: I86021e1ba2f79b7a10d452104855756abe80ec51 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Introduce the "install" command.Christian Kandeler2013-01-222-83/+3
| | | | | | | | | | | This decouples building and installing, e.g. allowing the latter to be executed by a privileged user to a system-wide directory. In addition, the ability to install build artifacts (typically executables or libraries) has been added. Change-Id: I28e725e4c1168eebe88e12c75e3d3e9f5fe28ca5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the "platform" concept.Christian Kandeler2013-01-181-1/+0
| | | | | | | | | | Ever since profiles were introduced, platforms have had no real purpose anymore, so it's about time we get rid of them. ("Property sharing" can instead be implemented via base profiles.) Change-Id: I1d629c9b698c7006f733a3c1382b0474f030915e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix framework include path handling on OS X.Jake Petroules2013-01-082-3/+7
| | | | | | | Task-number: QBS-197 Change-Id: I3fed74d1ac08b5d4247563e8a381160d8856c296 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix getLibraryName() in qtfunctions.js for framework buildsJoerg Bornemann2012-12-213-8/+10
| | | | | | | | Task-number: QBS-182 Change-Id: I5adc9733da13a8f63d71c060daa1a12b91dbf67f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce qt.core.frameworkBuildJoerg Bornemann2012-12-212-7/+8
| | | | | | | | | | | The bool property qt.core.frameworkBuild must be set to true on for framework builds of Qt on Mac OS. Task-number: QBS-182 Change-Id: Ida94ede578d6d68bc4d13e00cae60e436679e889 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Respect "warnings as errors" setting with MSVC compiler.Christian Kandeler2012-12-051-0/+2
| | | | | Change-Id: Ie073900e9072f812f0e7c11ce28d71d6d432d4d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move Qt-specific MSVC flags into qtcore.qbs.Christian Kandeler2012-12-052-1/+10
| | | | | Change-Id: I479b5eef8982bed86f27f1842893fae3a5507597 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 03:31:25 +0000