aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/config-ui
Commit message (Collapse)AuthorAgeFilesLines
* Use QStringLiteral more where it is possibleDenis Shienkov2019-02-251-4/+4
| | | | | | Change-Id: I7419cc3fbc1e8776de3943852dcedab4c95d1c32 Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for system-level settingsChristian Kandeler2018-06-015-6/+18
| | | | | | | | | | | | | In addition to the traditional per-user settings, there is now also a system-wide settings file affecting all users. The file's platform- specific default location can be overridden at build time. The qbs-config tool can write these settings via the new --system option. [ChangeLog] Introduced the concept of system-level qbs settings Change-Id: Ie6f675a74e96ce1fa7b2dd0712f6106071e848a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use 'auto' keywords more for the allocated variablesDenis Shienkov2018-01-231-5/+5
| | | | | Change-Id: I25ec97e64522d7fa486fcf408d8134cbbd8b24ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Modernize variable declarationsDenis Shienkov2017-11-301-1/+1
| | | | | | | | Use 'const' and 'auto' keywords more where static_cast is used. Change-Id: I60152b90fe5e44aa1ca513b43f133e604ed6417f Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use nullptr to initialize the pointersDenis Shienkov2017-11-201-1/+1
| | | | | | Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* STL compatibility: use empty() instead of isEmpty()Jake Petroules2017-11-161-4/+4
| | | | | | | This is a simple find and replace with manual sanity check. Change-Id: Iab6d46dcc3be246d1650aae2b1730f933b717be8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* STL compatibility: use size() instead of count()Jake Petroules2017-11-151-1/+1
| | | | | | | This is a simple find and replace with manual sanity check. Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* STL compatibility: use front() instead of first()Jake Petroules2017-11-142-2/+2
| | | | | | | This is a simple find and replace with manual sanity check. Change-Id: I82f0eb38b6a5a3b75a4ed38d97bdb6ce164d09b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use the [[noreturn]] attribute instead of Q_NORETURNChristian Kandeler2017-10-301-2/+2
| | | | | | | We can do this now that we require MSVC 2015. Change-Id: I77be55435d4db6c6ff17afeff779e163cf3803fb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Do not access the bundle module unconditionallyChristian Kandeler2017-08-021-2/+4
| | | | | | | | | | It is a mistake that the NativeBinary item currently pulls in the bundle module unconditionally (and also that the module is enabled everywhere). We want to change that. Prepare for the change by removing all unconditional accesses to the module's properties. Change-Id: If57b8222c1a0e2b09c33520882446fa71401f1f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Revert "Fix (wrong) GCC7 fallthrough warnings"Orgad Shaneh2017-06-021-2/+2
| | | | | | | | | Declare throwError with noreturn instead. This reverts commit 9030d940e089676d87a6854145733191e26fba60. Change-Id: I11c7adfec53090e326c47c08d4978c120e2ca98b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Change style of #includes of Qt headersJake Petroules2017-01-045-13/+15
| | | | | | | | | | | | | | | | By using q<lowercase>.h headers, we become more bootstrap-friendly, as no full syncqt is required any more. In the same go, prefix all includes with the module name. This helps grep-based analysis of which parts of Qt are used and where. It's also consistent with Qt's public headers (where syncqt enforces the style). Testdata and examples are excluded from the change, as they are not relevant for bootstrapping. Change-Id: I9539b1d795e87fca6e5fc6c91acbb775b79208d9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* macOS: Move foreground transformation code later in the lifetime cycleJake Petroules2016-12-052-9/+13
| | | | | | | | | This corrects an issue where the user sometimes needed to set focus on a different application and then back to qbs-config-ui in order to access the menu bar. Change-Id: Idecddd99e477cbee29a2e7d4aa16aeaf428757f0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update license headersIikka Eklund2016-08-291-14/+23
| | | | | | | | | | Patch-set 3 includes rest of the files. Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: I55ed96910b5cb13513f80eb118feafcdaa32e8b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update license headersIikka Eklund2016-08-293-42/+69
| | | | | | | | | | Patch-set 2 includes *.cpp *.c Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ie6e493097af6f7dd6a8adff170eb856f496e689e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Update license headersIikka Eklund2016-08-292-28/+46
| | | | | | | | | | Patch-set 1 includes *.h Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ib6cf3ac47dfba6dff262fded44bc952aef3bda8b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge 1.5 into 1.6Jake Petroules2016-06-283-6/+6
|\ | | | | | | Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
| * Do the OS X to macOS rename.v1.5.2Jake Petroules2016-06-273-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been replaced with "macos". For backwards compatibility, qbs.hostOS will still contain "osx" in addition to "macos", and an error will be printed if qbs.targetOS contains "osx" but not "macos". Specifying "macos" without "osx" is allowed. These checks are subject to be removed in a future version of qbs, so update your hostOS and targetOS checks accordingly. [ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed in a future version of qbs, so update your projects accordingly. Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-06-086-6/+6
|\| | | | | | | | | | | | | | | Conflicts: doc/reference/items/transformer.qdoc share/qbs/modules/cpp/GenericGCC.qbs Change-Id: I45560834560019b18274c373c45651eb8aadd206
| * Replace 'the Qt build suite' with 'Qbs' in copyright notices.Jake Petroules2016-06-066-6/+6
| | | | | | | | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Use Qt5-style connectsOrgad Shaneh2016-06-072-10/+9
| | | | | | | | | | | | | | The heavy lifting was done by clazy. Change-Id: Ibb13c517567b1b32bbda6d26225454d1b003934d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Remove items scheduled for removal in 1.6.Jake Petroules2016-04-221-2/+4
|/ | | | | Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove Carbon API usage.Jake Petroules2015-11-271-3/+1
| | | | | | | | | | | The new API has been available since 10.6 or 10.7 and the debugger indicates it simply calls through to TransformProcessType. Follows up an equivalent change in qtbase. Change-Id: I53c4bd024d2dbb1ba4fd98f2ea417eea8b7a1487 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Prevent config-ui from flashing in the Dock on OS X during `qbs help`.Jake Petroules2015-10-265-1/+66
| | | | | Change-Id: I57ebc37fb27cc23a5048f82f076decf75965c799 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* remove Qt4 work-aroundsJoerg Bornemann2015-03-191-1/+1
| | | | | | | QStringList::join supports QLatin1Char arguments in Qt5. Change-Id: Ic840473f0cb54c8c2a781bec3356c3c3c8e113af Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* update license headersJoerg Bornemann2015-03-025-10/+10
| | | | | Change-Id: I36d825db3a5ef32c162c3063aab1e8a1f2696f4f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Qbs build: don't bundle qbs-config-ui.Jake Petroules2015-02-191-0/+1
| | | | | | | | This is already handled correctly by the qmake build. Change-Id: Ia45079d935ddb1b7fbac7656be5c22e9108f3d48 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge branch '1.3' into 'master'Christian Kandeler2015-01-285-30/+30
|\ | | | | | | | | | | | | | | | | Conflicts: doc/reference/jsextensions/jsextensions-general.qdoc src/lib/corelib/language/evaluatorscriptclass.cpp src/lib/corelib/language/evaluatorscriptclass.h Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
| * Update LicenseEike Ziller2015-01-267-42/+42
| | | | | | | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | fix qbs buildJoerg Bornemann2015-01-131-1/+2
| | | | | | | | | | | | | | cpp.infoPlistFile is now bundle.infoPlistFile. Change-Id: Ic2860482447a8178aa6f6d0d15199a4e0bf5adf1 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Move the SettingsModel into the library.Christian Kandeler2014-11-056-373/+7
| | | | | | | | | | | | | | | | So that other applications can easily display qbs settings as well. Change-Id: Ic5e4ab5354f7879df29c90407905fc50b5546796 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | remove more Qt4 legacy from project filesJoerg Bornemann2014-10-311-2/+1
| | | | | | | | | | | | | | This amends commit 7c82e9f3. Change-Id: Ie01db1f28856fa16edee67aaf033c7150ecb197c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | qbs build: Introduce convenience item QbsProduct.Christian Kandeler2014-10-301-1/+0
| | | | | | | | | | | | | | | | As base product for QbsApp, QbsLibrary etc. Has little functionality at the moment, but will get more soon. Change-Id: I29ac78db2ff1ba109dd09a55e7593b2beeaba741 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-10-167-49/+56
|\| | | | | | | | | | | | | | | Conflicts: qbs_version.pri version.js Change-Id: I645b2f37bae9d36d4bca54b267d57df8b0b7fd21
| * License update.Eike Ziller2014-10-167-49/+56
| | | | | | | | | | | | | | Add LGPLv3 option. Change-Id: I8a63ad5e46a2701032b2103f791df4dec5b707e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add keyboard shortcut for deleting keys in qbs-config-ui.Jake Petroules2014-09-112-0/+24
|/ | | | | Change-Id: I354d4107bd87eccbfd67258428854381eeef211f Reviewed-by: Christian Kandeler <christian.kandeler@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>
* 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>
* factor out settings-related functions to own fileJoerg Bornemann2014-07-092-2/+15
| | | | | | | | 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-091-2/+5
| | | | | | | | 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>
* Allow the user to specify a custom place for settings.Christian Kandeler2014-02-217-9/+17
| | | | | | 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-215-13/+161
| | | | | | | These tools will soon get more options. Change-Id: I72ea2a180376b2e70c0c5b1119460adb3768e622 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-085-5/+5
| | | | | | Change-Id: Ib7f9a00bb891fa39c5bc1f891ddbfba1e4d23227 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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>
* Add editing capabilities to config-ui application.Christian Kandeler2013-08-124-15/+218
| | | | | | | | | | Configuration entries can be added and removed, and their values as well as their names can be changed. The latter feature means the GUI interface is now actually more powerful than the command-line version. Change-Id: Ic95954fe7bcae727448d25cfba833792ba47b5cb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs-config-ui: Fix output of lists.Christian Kandeler2013-06-271-1/+1
| | | | | Change-Id: Id76b495e55896e30fb2a121f672cbcfc51e5c5c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make Depends.name and Depends.submodules case sensitiveJoerg Bornemann2013-04-171-1/+1
| | | | | | | | | Also rename modules/qt to modules/Qt and use this form consequently. Task-number: QBS-254 Change-Id: I2e994f2bc5f93d4f887e14ac224ab360c54ad029 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* add qbs files to build qbsJoerg Bornemann2013-03-151-0/+16
| | | | | Change-Id: I3aca8364a58ac26a495909c0313f8f0588784b9f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Factor out common application project settings into a pri file.Christian Kandeler2013-02-131-11/+6
| | | | | | | | Our command-line tools have very similar pro files. Change-Id: I1676ed7eef92d22ab5e1c77f5170979e7ac6c1d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Build a shared library.Christian Kandeler2013-02-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want our code to be duplicated in memory for each application that uses it, so the library should not be linked statically. Some ramifications worth mentioning: - The unit tests had to be moved into the library, because otherwise we would need to export random internal symbols. This is why the patch appears so big. A follow-up patch should probably make compilation of tests optional, so the library can be deployed without unneeded code. - The DESTDIR of the auto test executables is now the same as the one of all other executables, so they can all use the dll on Windows without additional setup. - Some internal symbols were exported, namely: a) Logging-related stuff. This allows us to use a uniform logging approach in the library and in our command-line tools; I consider this acceptable. b) A handful of classes and functions currently needed by certain command-line tools. These seem more questionable to me and we should probably find a different way to implement the respective functionality. Change-Id: I9cd21e12cd622b55cf62f5e04ad398734410ede1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>