aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
Commit message (Collapse)AuthorAgeFilesLines
...
* Let detect-toolchains be used like setup-qt.Christian Kandeler2014-02-1317-277/+495
| | | | | | | | | | Namely, let people specify a specific compiler and profile name instead of offering only auto-detection. Also rename to setup-toolchains for even more consistency. Task-number: QBS-496 Change-Id: I8c144d7b4dd26e38652f10c1fff56af4daf3cecb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make the MinGW build of setup-qt work for non-admin usersJoerg Bornemann2014-01-294-0/+26
| | | | | | | | | We now embed a manifest in the MinGW build of qbs-setup-qt. Task-number: QBS-275 Change-Id: Id984987a57850c0aed23a7c6852c15e447a2f096 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2014-01-221-0/+6
|\ | | | | | | Change-Id: I2c4aa7cb7ec7db58577ceac5cb56bc925ae9360f
| * Make config commands understand booleans.Christian Kandeler2014-01-161-0/+6
| | | | | | | | | | | | | | | | | | | | The user frontends for our settings assume everything is a string, so do the necessary conversions. Note that this means there is no way to set the string values "true" and "false". For a correct implementation, users would need to supply types when adding new values. Change-Id: If3638525eeebe73857834389bae46484eee92cc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Introduce xcodeSdkName and xcodeSdkVersion properties.Jake Petroules2014-01-171-0/+4
| | | | | | | | | | Change-Id: I6572b085c24cf8ba6d1a41dab267182cabe6aab8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Move knowledge about Qt modules into libsetupqt.Christian Kandeler2014-01-161-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition, we make less hard-coded assumptions than before, instead generating almost all modules dynamically from the respective Qt installation when setup-qt is being run. This way, qbs does not have to know about all the modules beforehand, and only the Qt modules that are actually present will have qbs counterparts, making it possible for project file authors to make use of soft dependencies for Qt modules. Task-number: QBS-479 Change-Id: Ie20d2acf249cd159ce4caff2ede4721ab879fad2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Prepare for using QT_NO_CAST_FROM/TO_ASCII.Jake Petroules2014-01-149-135/+171
| | | | | | | | | | Change-Id: Ib39e49e896cbddf5a5bd851088500991d962355a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Move Qt profile setup into a dedicated library.Christian Kandeler2014-01-108-241/+8
| | | | | | | | | | | | | | | | Otherwise all changes to the implementation will have to be duplicated in IDEs. Change-Id: I61e6d4fa1ee9b724eb5d9de9f233dc915a6c8bc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Introduce per-profile preferences.Christian Kandeler2014-01-093-24/+48
| | | | | | | | | | | | | | | | | | | | Individual profiles can now override global preferences. The look-up up of a preference key for a given profile happens in this order: Profile preferencess -> Base profile preferences (recursively) -> Global preferences. Search stops when the key has been found. Change-Id: Ia343acc67d326cb11dc8663651a7dbe8e46a7c74 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/1.1'"Christian Kandeler2014-01-0954-54/+54
|\ \
| * | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2014-01-0954-54/+54
| |\| | | | | | | | | | Change-Id: Iccf01f1dad3fca4a78c7d9b795fdef6df0181e9b
| | * Incremented year in copyright infoRobert Loehning2014-01-0854-54/+54
| | | | | | | | | | | | | | | | | | Change-Id: Ib7f9a00bb891fa39c5bc1f891ddbfba1e4d23227 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | setup-qt: Separate actual profile creation from the rest of the code.Christian Kandeler2014-01-096-139/+244
|/ / | | | | | | | | | | | | | | | | | | The core functionality of creating a qbs profile from general information about a Qt version will go into its own library. The other code (finding qmake executables, parsing query output etc) will stay in the application. Change-Id: I9100794faefb94d4c5cbdbbbbc45fef7fb8f88fc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/1.1'"Christian Kandeler2013-11-286-54/+103
|\ \
| * | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2013-11-286-54/+103
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs_version.pri src/app/detect-toolchains/msvcprobe.cpp src/app/detect-toolchains/probe.cpp src/lib/language/language.cpp version.js Change-Id: I21c1e9a8bf0175d392cd2ff9fa5254a073ed0af8
| | * simplify output of detect-toolchainsv1.1.1Joerg Bornemann2013-11-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't display the Windows SDK version on a separate line. Change-Id: I48d4127c32145e4bde0138f2cfb960378a56c4f4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * use the Windows SDK version, not the ProductVersionJoerg Bornemann2013-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The "ProductVersion" of the Windows SDK is mostly useless for the user. Also, it can contain strange values like "6.2..9200", so better don't use it. Change-Id: I8c56979e4c020215558e328e0d936a8e0765554b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * fix Windows SDK lookup for x86_64 buildJoerg Bornemann2013-11-271-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | 64 bit builds of qbs must look in the Wow3264 registry tree. We already did that for VS but not for the SDKs. Change-Id: If96b7d184816c20b7075c5392bc1fdbb45d6f01d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * add /FS to cpp.platformC(xx)Flags for VS 2013Joerg Bornemann2013-11-271-4/+10
| | | | | | | | | | | | | | | | | | | | | Task-number: QBS-411 Change-Id: I83436f66e9de4f22e0a980c6322909e9854b91cf Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * Fix formatting of command line option descriptions.Jake Petroules2013-11-261-23/+28
| | | | | | | | | | | | | | | | | | | | | Lines now wrap at 80 characters and each line is properly indented. Change-Id: I38f6e25550dfdd4f8fbf84a9431cfca4ba3f9427 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * fix "invalid subsystem" warning for MSVCJoerg Bornemann2013-11-262-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look at the MSVC version of the mkspec Qt is built with to determine the minimum Windows version. Also, use 5.2 as minimum Windows version for 64 bit. Task-number: QBS-406 Change-Id: I4693cc055eb5309e8c5528e94a03d264fc553c67 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * Braces cleanupOrgad Shaneh2013-11-263-11/+8
| | | | | | | | | | | | | | | Change-Id: I6ed221814912d80c6fdf41276d521b4da2345df2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | | Return a clean build directory from the command line parser.Christian Kandeler2013-11-281-0/+1
|/ / | | | | | | | | | | | | | | Otherwise, artifact file paths will not have the expected form if command-line arguments such ad "-d ." are used. Change-Id: I1ca3fa4f6167a506a80bf996c6f0f5c97a4e44f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Support specifying the Qbs build directory as a command line option.Jake Petroules2013-11-268-1/+94
| | | | | | | | | | | | | | | | | | Also supports changing the default build directory ('.') using the 'preferences.defaultBuildDirectory' property. Task-number: QBS-462 Change-Id: Id3d05d2f5b14197bd3af2e7f9d55bdd263809716 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Rename OsxProbe to XcodeProbe.Jake Petroules2013-11-225-22/+22
| | | | | | | | | | | | | | This name is more accurate and more consistent with e.g. MsvcProbe. Change-Id: I7694da8070dba80178db733c434eb4bd777cc469 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2013-11-221-2/+4
|\| | | | | | | | | | | | | | | | | Conflicts: src/lib/language/moduleloader.cpp src/lib/language/tst_language.cpp src/lib/language/tst_language.h Change-Id: Iaaf4e015a234cdd9f51630ad218daec1b83b2a84
| * Fix settings export.Christian Kandeler2013-11-211-2/+4
| | | | | | | | | | | | | | The current code does not work for list values. Change-Id: I21ae1dcdc1185c48bbccc1ed94b31259f41fb5a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Centralize determination of endianness.Jake Petroules2013-11-193-14/+6
| | | | | | | | | | Change-Id: Ia99ed4de2a07fa8959301a50e41cdb0367de46ea Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2013-11-141-0/+9
|\| | | | | | | Change-Id: I7475c4a71c15c83c59400c44ef96d73d15caea58
| * build fixJoerg Bornemann2013-11-131-1/+1
| | | | | | | | | | | | Change-Id: I05dcf2d3a4e4f1e20081469382faf1912f676f8d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * detect-toolchains: set qbs.endianness for MinGWJoerg Bornemann2013-11-131-0/+2
| | | | | | | | | | | | | | | | Task-number: QBS-446 Change-Id: I4a1b88d1657e7ec71dc6e41e690f00dc606d3931 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * detect-toolchains: set qbs.architecture for MinGWJoerg Bornemann2013-11-131-0/+7
| | | | | | | | | | | | | | | | Task-number: QBS-446 Change-Id: I1c67c780dad5b5cc0444ede950809ae3cf71c67a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Merge "Merge branch '1.1' into 'master'."Joerg Bornemann2013-11-063-2/+13
|\ \
| * | Merge branch '1.1' into 'master'.Christian Kandeler2013-11-063-2/+13
| |\| | | | | | | | | | Change-Id: Ia6cb10047d02ebe2752984f57e8b729be9d6552e
| | * make qbs-config-ui a non-console applicationJoerg Bornemann2013-11-062-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QBS-445 Change-Id: Ib26846fefb620e4ade6b7d7b727e21fdf44b9103 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| | * Separate between overridden values and others in command-line frontend.Christian Kandeler2013-10-311-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code is too simplistic in that it just pretends the whole configuration was explicitly set on the command line. This can lead to precedence problems regarding module properties set in project files and profiles. Change-Id: I50113486159308a9660be7b86d2e2240527df73e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Fix meaning of "Command.silent".Christian Kandeler2013-11-061-2/+1
|/ / | | | | | | | | | | | | | | | | | | | | The new, saner meaning is: If this property is set to true, then qbs will not print the status message (containing the command description). Accordingly, the default is changed to false. Also, there is now a check that prints a warning if a non-silent command has an empty description. Change-Id: I5a8fd4e2f8901f6e2858946901e8081a6929d43f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* / Centralize architecture canonicalization data.Jake Petroules2013-11-044-41/+4
|/ | | | | | Task-number: QBS-403 Change-Id: I814cdc93adafdcdbc66ec6b72fc9e98c6a7b866d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix product/module name collisionJoerg Bornemann2013-10-301-1/+2
| | | | | Change-Id: I6a5d57b2ec0cfb5ca3eaf0e261a1b60f90c08258 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix potential deadlock in Ctrl-C handling.Christian Kandeler2013-10-282-16/+56
| | | | | | | | | | The current code calls into the Qt event system from the interrupt handler, which will lead to a deadlock if the interrupt came in during event handling. Change to an approach that does only minimal work in the interrupt handler. Change-Id: Ic4e615939305390efd819b47fa02c7fadb6acf16 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix build with namespaced Qt.Christian Kandeler2013-10-221-1/+7
| | | | | Change-Id: I6374e4d8153e2de390f408454c650c21de57a175 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* create a profile per MSVC installation and per architectureJoerg Bornemann2013-10-161-14/+28
| | | | | | | | | | detect-toolchains will now create one profile per supported architecture per found MSVC installation. Task-number: QBS-404 Change-Id: I6ca569c312c31c39c49cfbfe5ffa638698fb90b2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Canonicalize architecture in probes.Jake Petroules2013-10-143-2/+42
| | | | | Change-Id: I073396c3012a2e8e58dbaffdce151a12d16fd3de Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove unused code from toolchain detector.Christian Kandeler2013-10-141-10/+0
| | | | | Change-Id: Ib897f5a9b44c41f87807b2f912dc0d5347d2417f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Set compiler flags for using a libc++ build of Qt.Jake Petroules2013-09-041-0/+7
| | | | | | | | Task-number: QBS-194 Change-Id: Ic74aa7d53df0ff25bbaf8ce4d599adbe00dbbba4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Introduce Qt.core.config property for user-config items.Jake Petroules2013-09-041-0/+1
| | | | | Change-Id: I051daa84a6a8e569a13e8ff289563dfc7df77853 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Raise iOS deployment target. Qt 5 will only support iOS 5.0 and above.Jake Petroules2013-09-041-1/+1
| | | | | | Change-Id: I0feb7c2aadd8b107b3a89b1adabd48b7973bd11f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* check for existence before execution of a toolJoerg Bornemann2013-09-041-1/+8
| | | | | | | | This is a work-around for QTBUG-5990. Change-Id: I58f6f40cec7d9f5ac4bb90c1c2178b0e367fb1f6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Remove "showProperties" command.Christian Kandeler2013-08-2010-156/+2
| | | | | | | | | Firstly, it's more of a debugging thing than something that should be exposed as a command to users. Secondly, it's not very useful, as all the groups and artifacts can have different properties. Change-Id: I4aec83550c2f8e597752a181437e580622a6a587 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix setup-qt for Qt 5.2Joerg Bornemann2013-08-191-2/+7
| | | | | | | | The location of the mkspec is in the source dir for developer builds. Change-Id: I3374763fae041568b989865dbad24fd6c7932e02 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 13:05:32 +0000