aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
Commit message (Collapse)AuthorAgeFilesLines
* Avoid contractions in user-visible messages.Christian Kandeler2014-07-311-1/+1
| | | | | Change-Id: I68685166bfaa873f1e5995c7d507afef45b03055 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix setup of cpp.compilerPathByLanguageJoerg Bornemann2014-07-301-0/+1
| | | | | | | | | The existence of the correct compiler binaries was checked, but the compilerPathByLanguage map was never updated. It always contained the initial strings "gcc", "g++" and so on. Change-Id: Ied9e164af0fd102b2a061665921f51f96ca9eb80 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* add a simple Version classJoerg Bornemann2014-07-211-14/+6
| | | | | | | | This class replaces the Version struct in setup-qt and the ImportVersion class of the loader. Change-Id: Ic65eaf62de44ce0c082fe805431463defce1fe3b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* don't print usage on missing project fileJoerg Bornemann2014-07-211-4/+2
| | | | | | | | | | This error is obvious enough to not show the entire help. Also, this behavior is consistent with "qbs -f /dir" where /dir doesn't contain a project file. Change-Id: Icb0a4d8ce41d7480e02aca262faf14922aecab6e Task-number: QBS-655 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix MinGW compiler detectionJoerg Bornemann2014-07-171-1/+2
| | | | | | | We must take the executable suffix into account. Change-Id: Idcb6abbf7801d2a1d49239ed81521d83a278e4f1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Speed up project re-resolving by skipping the loading from file.Christian Kandeler2014-07-161-1/+1
| | | | | | | | When re-resolving an existing project, the build graph already exists in memory and does not have to be read from disk. Change-Id: Icf5cf7396a859d4ee1c495b8cc4fa7a1ee61ff1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add an Info.plist for qbs-config-ui.Jake Petroules2014-07-143-1/+19
| | | | | | | | This will display the friendlier 'Qbs Settings' in the menu bar on OS X instead of falling back to 'qbs-config-ui'. Change-Id: I920073bb97030fd606431b16d742d8f137579e9c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce cpp.compilerPathByLanguageJoerg Bornemann2014-07-141-16/+38
| | | | | | | | | | The setup-toolchains tool stores the compiler path per language in compilerPathByLanguage for toolchains that provide different compiler binaries for different languages. For the gcc/clang toolchains we now use g++/clang++ for C++ and gcc/clang for everything else. Change-Id: I62ce5a5a4217e2832fafd03301ff75efab62a608 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Make qbs-config-ui menu more cross platform.Jake Petroules2014-07-111-3/+4
| | | | | | | | | | Use QKeySequence for cross-platform shortcuts, and set the menu role for the Exit/Quit item. Change-Id: I8143f562efdba1cb315c4e4762baf3472165122a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make the GCC linkerName different from compilerNameJoerg Bornemann2014-07-112-0/+5
| | | | | | | | In a subsequent commit we want to use "gcc" for compilerName but keep "g++" for linkerName. Same for clang. Change-Id: Id179ef9152e6fe3d729505f53fc57e39cb46d99e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix "Failed to compare version" warning on OS XJoerg Bornemann2014-07-101-2/+2
| | | | | Change-Id: I38eadf5070ba0789c2865f9d4c31bd7f70c82059 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qbs-config: Get rid of the "CfgGet" command type.Christian Kandeler2014-07-103-5/+2
| | | | | | | | This one is silly. It has the same functionality as "CfgList", but takes a different code path and can format values differently. Change-Id: If77023bc9960ea545e3cfdc11b763e0f32a98409 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs-config: Understand JavaScript for all types.Christian Kandeler2014-07-101-34/+9
| | | | | | | | | | The current code understands JS maps, but not lists of maps etc, which is certainly unexpected. So allow JS literals for all types. Additionally, simple sequences of characters are still interpreted as strings, so users are not forced to quote in the common case. Change-Id: Ifd345b86cd730fb1d394dbf90e9357fed86edd97 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* support map values in settingsJoerg Bornemann2014-07-101-0/+39
| | | | | | | | | The config command can now read and write maps. Example: qbs config foo '{"foo":"bar","zoo":"baz"}' Change-Id: I54c67f21fd6fd4a291d547abb6097a0dd9022d9f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* factor out settings-related functions to own fileJoerg Bornemann2014-07-096-22/+70
| | | | | | | | This allows us to add more complex functionality to the Settings/String conversion functions. Change-Id: Ic4896868914d7f6e5a0bbd64beb0d64d3fd82ce7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove qbsSettings() functionJoerg Bornemann2014-07-0914-36/+23
| | | | | | | | Don't use a special Settings shared pointer. This simplifies the code a lot. Change-Id: I974cf9634d1760633744b1ed3cc18a9458ae2caf Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove unused filesJoerg Bornemann2014-07-082-267/+0
| | | | | Change-Id: Ie9f14d051e9d82a682637862aef767ded7721e7b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove superfluous includeJoerg Bornemann2014-07-081-1/+0
| | | | | | Change-Id: Iade9a135a051b0af788c3ba7ff1f283a60c99bf1 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* setup-toolchains: detect location of ar and nmJoerg Bornemann2014-07-071-2/+39
| | | | | | | | | | Gcc's executables might be split among several directories. This is the case when using e.g. an installed icecc. The toolchain's install path is /usr/lib/icecc/bin but the archiver is in /usr/bin. Task-number: QBS-528 Change-Id: I8f448b482bb00854a3144643e886634199d37012 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Revert "Correctly set toolchain prefix for GCC cross compilers."Joerg Bornemann2014-07-071-12/+1
| | | | | | | | | | This reverts commit 8ee37bfaed662dcae521c4c901ea91aec3258547. For MinGW this code is irrelevant and for gcc it never had any effect as the property values are overwritten right below the call to setCommonProperties. Change-Id: I6784d992fd4488ef479425a98a075c48c74549d7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* teach setup-qt how to detect broken Qt packagesJoerg Bornemann2014-07-021-2/+10
| | | | | | | | | | Qt4 packages for MinGW have an invalid QMAKESPEC_ORIGINAL set. See QTBUG-28792. We must work around this issue. Change-Id: Ibf41e4a8eaed8aa5a7855693aaf653fc5d323cd1 Task-number: QBS-629 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Move property appInstallDir all the way up.Christian Kandeler2014-06-251-1/+0
| | | | | | | | Overriding this value in an aggregate project does not work if we declare it in apps.qbs. Change-Id: I41606b82266057b414275f49bf9d21a9a06044c1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Command-line frontend: Make plugin and search paths configurable.Christian Kandeler2014-06-243-7/+10
| | | | | | | | | Projects embedding qbs might put these somewhere else. Task-number: QTCREATORBUG-12473 Change-Id: I13e1a1843586501bb3e17a314ccd11af6c25ee43 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-051-2/+2
|\ | | | | | | Change-Id: I6cec75208dec6d45172b00e9b36c845b095b8ac3
| * Fix messages.Takumi Asaki2014-06-021-2/+2
| | | | | | | | | | | | Change-Id: Ie06e48637ea0bb10e2383f75c6a33488c275a29a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add the settings directory to the project setup parameters.Christian Kandeler2014-05-261-4/+1
| | | | | | | | | | | | | | | | | | This way, the settings become available for use in the qbs library, which means it can, for instance, expand the build configuration itself instead of putting this burden onto the API callers. Change-Id: I09e6067990ac2b7c2238951f9759fe52dc51b6f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Sanitize the project setup API.Christian Kandeler2014-05-231-14/+9
| | | | | | | | | | | | | | | | | | | | | | Ever since we introduced "overridden values", the setter for the build configuration has been pretty much an empty shell, containing only the build variant and the profile. We now make that explicit, resulting in a less confusing API that does not expect the caller to know how to encode profile and build variant information in a QVariantMap. Change-Id: I60183fc1884a884c9ceba34d7eb460c261be47ca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | introduce Qt.quick.qmlPath propertyJoerg Bornemann2014-05-161-0/+1
| | | | | | | | | | | | Task-number: QBS-578 Change-Id: I116987d3232a832137781d4d5ac90adf4bd7ed88 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Now supports compiler name without path in setup-toolchainsPavel Shramov2014-05-081-2/+11
| | | | | | | | | | | | | | | | setup-toolchains may now lookup compiler binary in PATH variable Task-Number: QBS-540 Change-Id: I5ec1c3419dc2e0120bb309be3f0f612228a928e7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-04-282-4/+4
|\| | | | | | | | | | | | | | | | | Conflicts: qbs_version.pri share/qbs/modules/cpp/msvc.js version.js Change-Id: Id00deaf66737efd0e35230e2bddd41de1a6de60d
| * fix XcodeProbe::compareVersionsJoerg Bornemann2014-04-231-3/+3
| | | | | | | | | | | | Task-number: QBS-556 Change-Id: I1f38394a8b60aae3185901176dce9439d6ad111a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * setup-qt: fix help textJoerg Bornemann2014-04-161-1/+1
| | | | | | | | | | | | Change-Id: I15341377851a0ccfc8377f381192b9f6a9e51f5d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Adapt apps project files to be better embeddable in other projects.Christian Kandeler2014-04-233-3/+11
|/ | | | | Change-Id: I785bf772facf06e421754a07cce45c4b94e30196 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix compilation on Windows.Christian Kandeler2014-04-111-0/+1
| | | | | | Change-Id: I39e0e268bdcfdae16dd9fb9c4a44261513c9ba60 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* detect Visual Studio build environment using vcvarsall.batJoerg Bornemann2014-04-086-5/+258
| | | | | | | | | | | | | | | To provide a consistent build environment for Visual Studio setup-toolchains now executes the vsvarsall.bat that comes with the Visual Studio installation. The environment is written to the profile under the key "buildEnvironment". The setupBuildEnvironment script in windows-msvc.qbs isn't needed anymore. Task-number: QBS-444 Task-number: QBS-508 Change-Id: I3191f5ff127bed6b96ce5ea5520b20fc9646364f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* move MSVC info classes to separate fileJoerg Bornemann2014-04-034-14/+52
| | | | | Change-Id: I1f10d1eb87ed0fe67cd1b8bc79d8c76d229e98de Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* clean up qbs-setup-toolchains.proJoerg Bornemann2014-04-031-2/+13
| | | | | Change-Id: I201751d1780f6bb411c773df2fcf10a9e5d37e4d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Combine createGccProfile and createMingwProfile.Jake Petroules2014-03-121-25/+16
| | | | | | | They were substantially similar. Change-Id: I2ec29d7eb1691b3c2d8de7075843b88773c7cb63 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Correctly set toolchain prefix for GCC cross compilers.Jake Petroules2014-03-121-1/+12
| | | | | Change-Id: I3e1c73a22ff2abd9ce7d64515a2830aaf076095c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Improve human readability of and consolidate probe functions.Jake Petroules2014-03-121-10/+10
| | | | | Change-Id: Ibc9b695e86981d346faff2c1dc05c93cccfdd0f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Detect MinGW on all platforms.Jake Petroules2014-03-041-9/+22
| | | | | Change-Id: I4e93aadf5b196087942af1b427cfef8d6b7dc72b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Normalize signal/slot signaturesOrgad Shaneh2014-03-031-2/+2
| | | | | Change-Id: I88e51bf4c33bbeeacb22a94b735d1faf4f76023f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Recognize more MinGW machine names.Jake Petroules2014-03-031-4/+10
| | | | | Change-Id: I92730e0a2c604044869808ffcf6772dd23809625 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Canonicalize more architectures.Jake Petroules2014-03-031-8/+2
| | | | | Change-Id: Ib792d1d933fee0cfaf1a968517946b407b8072e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the "lib" part of plugin and library locations configurable.Christian Kandeler2014-02-273-2/+9
| | | | | | | | Can now be set to e.g. "lib64" if required. Task-number: QBS-343 Change-Id: I6f34ade37f39400cc5fde63133a464565feb34c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce qbs::LanguageInfo classJoerg Bornemann2014-02-271-7/+4
| | | | | | | | | This public API can be used to get information about the qbs language items. Currently it's only used for qbs-qmltypes. This change will enable us to un-export ScriptEngine and Loader. Change-Id: I0c92c7f6e37f6444c51198729cbb5435dc90bb40 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Do not put the plugins where the resources are.Christian Kandeler2014-02-251-1/+1
| | | | | | | | | | | That's not where they belong. Also make less assumptions about the file path leading to them. Ideally, we should also do the latter for the stuff in share/, but then someone would have to touch the horrific qmake code in static.pro. Task-number: QTCREATORBUG-10074 Change-Id: Ide9c4b83dcf0cd7a62b57643b79caf05662358cb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow the user to specify a custom place for settings.Christian Kandeler2014-02-2128-96/+207
| | | | | | Task-number: QBS-509 Change-Id: I4ad32c648121068880d652e3ba39d4eea59dfbc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add command line parser classes to config-ui and setup-qt.Christian Kandeler2014-02-2110-68/+369
| | | | | | | These tools will soon get more options. Change-Id: I72ea2a180376b2e70c0c5b1119460adb3768e622 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the tool for setting up MADDE platforms.Christian Kandeler2014-02-205-221/+0
| | | | | | | I mean, come on. Change-Id: Ia376e1026fc0f8f5b67c0ded8b64e38ead75660f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 04:30:45 +0000