summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Install to /usr/local rather than /usr by defaultHEADmasterShawn Rutledge2021-10-282-2/+2
| | | | | | | | | | | | /usr/local has always been more appropriate when a user builds it for herself. If anyone is still packaging this into a distro package, they can override the prefix by setting the prefix env variable: prefix=/usr make -e install This gets us a bit closer to following GNU conventions for makefiles: https://www.gnu.org/software/make/manual/html_node/Directory-Variables.html Change-Id: I07622f3fa816f72a0c84233f4b760ceda2137f17 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* add new tools for Qt 6Shawn Rutledge2021-10-281-1/+21
| | | | | Change-Id: I37b09494658d3a177d4214bc03d64e3dab9711e6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add qtattributionsscanner to the Makefilev66Friedemann Kleint2018-05-041-0/+1
| | | | | | | It is required for Qt for Python builds. Change-Id: I7be193c965497f547ef256594ca53f09e5471901 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix checking return value of endsWithDmitry Shachnev2017-10-291-1/+1
| | | | | | | | | endsWith(buf, target) returns true when buf ends with target, not zero. So the current condition is reversed and fails when link is not pointing to qtchooser. Change-Id: Ia854ed0030fc2723e23011aea2c097f90603a04b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add a few more tools to qtchooser:Thiago Macieira2017-08-031-0/+5
| | | | | | | | | | | | | | | | | | | - qgltf [Qt3D] - qmlcachegen [QtQml] - qmljs [QtQml] - qvkgen [qtbase] - repc [QtRemoteObjects] Not added: - canbusutil - qfloat16-tables - qtattributionscanner - qtwaylandscanner - sdpscanner Change-Id: I3868166e5efc45538544fffd14d72a7186eace6b Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove qglinfoAlexander Volkov2016-11-101-1/+0
| | | | | | | | | | It was removed from Qt3D by a96be4ff65df3e76094ac5e7e6b1724adb252808. Change-Id: Ib772704132701d0373f2fca0f08aadae66635c73 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fish: let qcd switch between src and qt dirFrederik Gladhorn2016-07-171-3/+13
| | | | | Change-Id: Id3225192bcf21318c2a542866a3af73da03fcc1a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fish: auto complete paths in qcdFrederik Gladhorn2016-07-171-0/+9
| | | | | Change-Id: I33a0edfcbe7238058a23e6f89aee78b3f250c0ea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fish: auto complete available qt versionsFrederik Gladhorn2016-07-171-0/+2
| | | | | Change-Id: Ib04207900afa532648efbaebe7591e6091690b8b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix argument for fish version of qcdFrederik Gladhorn2016-07-171-2/+2
| | | | | | | | | test would error out, it needs the parenthesis. Using -l for set is another bug, it would simply create a variable inside the if block scope instead of modifying the outer one. Change-Id: I09cd12cf8eeca0c23747a42d556a718b5faba27b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make sure that "make check" compiles the main binaryThiago Macieira2016-05-121-1/+1
| | | | | | | | The unit test usually just uses the test mode, but there's at least one test that uses the real one. Change-Id: Id75834dab9ed466e94c7ffff1444a9d55dfbbbbb Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Add "make tagdist" that creates the tag and makes a packageThiago Macieira2016-04-271-1/+8
| | | | | | | | | This switches to using "vXXX" tags because: a) standard in the Qt Project b) GitHub strips the 'v' when creating release tarballs Change-Id: Id75834dab9ed466e94c7ffff1444ab9c157eef1b Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Add support for qmake -query with /src and /getThiago Macieira2016-04-271-9/+16
| | | | | | | | | Since qmake knows where the source and build dirs are as well as when it's already installed or not, let's simply ask it. Change-Id: Id75834dab9ed466e94c7ffff1444a9120ef90862 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fish environment scriptsFrederik Gladhorn2016-03-181-0/+120
| | | | | | | | | | | | This script is a port of the bash/zsh scripts. It uses a different approach of finding the src dir since .qmake.cache was deprecated and doesn't contain any data since at least Qt 5.6. The file can be sourced from ~/.config/fish/config.fish by adding for example "source ~/qtchooser/scripts/qtchooser.fish". Change-Id: I962eef746d97db811a92fd2fdd8b305f991fd793 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Fix locating src dirFrederik Gladhorn2016-03-161-2/+2
| | | | | | | | | .qmake.cache is empty for qtbase builds. Instead use the Project: line in the Makefile to guess where the sources are. Change-Id: I112a583df8ed03f909df752f3db96ec6e707f71b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Add qtplugininfoAndrea Scarpino2015-10-081-0/+1
| | | | | Change-Id: I0d95b9c991bc8a0b87fa9c6c2327d1fb6dcf8fd2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Implement fallback mechanism for some toolsDmitry Shachnev2015-02-101-8/+52
| | | | | | | | | | | | If a tool was requested without specifying the SDK name, and the default SDK does not have that tool, fall back to any installed SDK that contains that tool. Currently this is enabled only for qdbus, qmlscene, and for tools that are new in Qt 5. Change-Id: I19a82a06c75fe9cd624aa51b086d72e75310ba35 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* set CMAKE_PREFIX_PATHShawn Rutledge2015-01-151-0/+4
| | | | | | | | | so that cmake can find the chosen Qt version when building packages that depend on Qt. Change-Id: Ifd8b85b331fc718a14f22c2e4dc3af1315a60a62 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Use a variable for the qmake executablePino Toscano2015-01-021-1/+2
| | | | | | | | | | | | Use $(QMAKE) (defaulting to "qmake", like before) to refer to the qmake executable. This allows to use in tests a qmake not in $PATH (e.g. in a local installation), without altering the environment: $ make check QMAKE=/path/to/qmake Change-Id: I4ed906a5b911b6aed82596219ca813c643db6d62 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix possible buffer overrun in use of readlink(2)Thiago Macieira2014-12-181-2/+2
| | | | | | | | | | | | | | | | The man page says: readlink() does not append a null byte to buf. It will truncate the contents (to a length of bufsiz characters), in case the buffer is too small to hold all of the contents. [...] RETURN VALUE On success, these calls return the number of bytes placed in buf. So we need to pass size-1 so we'll have room for the NUL byte at the end. Change-Id: I9ccfb451f8dbe39bc1786864fbd4d0f018598e00 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add qmleasing and qmllint toolsAndrea Scarpino2014-12-121-0/+2
| | | | | Change-Id: I04093a0001c90b406f027e54c9b9d8fd1895ea19 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add the install mode for qtchooserThiago Macieira2014-06-133-42/+309
| | | | | | Change-Id: I8bbd7fc683e341ca6af3b1396a655684233f5562 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add qlalr to the tools (it's built by default from src/tools/qlalr)Simon Hausmann2014-06-051-0/+1
| | | | | Change-Id: Id5c80f645a49f2226ac2275a2c34a5ac75bedae4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Completion for bashJ-P Nurmi2014-05-221-0/+12
| | | | | | Change-Id: Ie2cfb3de74f7bec15391110e6c213e839108dc84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Added qtdiagTomasz Olszak2014-05-011-0/+1
| | | | | | Change-Id: Ic58548eacbb31aa2fbaf0e8f69e94f566783468c Reviewed-by: Philippe Coval <rzr@gna.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add qmlimportscanner, qtpathsAndrea Scarpino2014-01-161-0/+2
| | | | | | Change-Id: Ibd0829127a246f4a97e46cbaa6d99117f826fc86 Change-Id: I870bdd0b46c97721356c8cd3fbb8778ff081ff4c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Created */man/man1 directory before installing manual.Tomasz Olszak2013-12-181-0/+2
| | | | | | | | In packaging systems like rpmbuild the /usr/share/man/man1 may not exist. Change-Id: I23a2ddc22bcf13edfc0cb211f3f17d3d521e2bb3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add QTCHOOSER_NO_GLOBAL_DIR to the man page.Lisandro Damián Nicanor Pérez Meyer2013-12-171-0/+6
| | | | | | | | Document what QTCHOOSER_NO_GLOBAL_DIR does in the man page. Change-Id: I00bb056eba0713ebb70c52a1ad332050ffcca052 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make install installs the man page tooShawn Rutledge2013-12-161-0/+1
| | | | | Change-Id: I1c1afa489db7878277264d289b6da2c060de4d1b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix test failure: -list-versions must not include .confqtchooser-39-g4717841Thiago Macieira2013-12-162-6/+11
| | | | | | | | The output should match what gets put on the environment variable, in the -qt argument, etc. Change-Id: Ibab71182d7962cdd1ffa8e175810bfab987a3974 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* add qml to the list of toolsShawn Rutledge2013-12-141-0/+1
| | | | | | | | | It's new in Qt 5.2.0. Change-Id: Ibb24f1cc82cbd74f4886f512986e1d45f29ae326 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Always ensure that the hardcoded paths are foundSune Vuorela2013-12-091-1/+1
| | | | | | | | | | | | Practice has shown that quite many sets XDG dirs for various purposes and that spoils qtchooser finding the distro provided Qt without adding like /usr to the XDG dirs variable which kind of kills performance. Provide a dedicated variable to disable a global installation. Change-Id: I58953e3b2b3cf43cb67d4c367312e83cfa9ad2b3 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add support for Mac-specific tools to qtchooserThiago Macieira2013-10-161-0/+8
| | | | | Change-Id: I510ff1b560f5229497ad10632607590ee98b831d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Doc: Fix typoOrgad Shaneh2013-07-201-1/+1
| | | | | Change-Id: I2c15a4cd078a334368a3cb61c6233d4ce9aee47f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Print a sorted list of Qt versionsThiago Macieira2013-05-231-8/+17
| | | | | | | Right now, we're getting a directory order, which is arbitrary. Change-Id: Ia40c62ba9704fcc22504b1282f430e1fb18255d9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Use a regular function pointer for visitingThiago Macieira2013-05-231-4/+5
| | | | | | | No need for a PMF. Change-Id: I926b51be3e1a1a1ac4fb7dafc670b48a76fe88d2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Require an exact match to the tag when releasingThiago Macieira2013-05-231-1/+1
| | | | | Change-Id: Id4860109d680f50a94581fb407a8b9320cc68668 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* create a system default pathqtchooser-31-g980c64cSune Vuorela2013-05-182-2/+13
| | | | | | | | | | | Make it possible to build qtchooser with a system default search path build using make QTCHOOSER_GLOBAL_DIR=/usr/share/ will make qtchooser fall back to search in /usr/share/qtchooser/ as a last option if XDG_CONFIG_DIRS is not set Change-Id: Ie0d438ddc1e259d4c5fb70aa332bd6bfef2448e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Give home configurations precedence over system onesAndrea Scarpino2013-05-141-3/+4
| | | | | Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use getline from POSIX.1-2008 when availablePino Toscano2013-04-261-1/+26
| | | | | | | | | | | Ask the standard library to use POSIX.1-2008, and if available use its getline function to read lines from the SDK configuration file. If not, fallback on the current way (fgets with PATH_MAX-sized buffer), which is now used only if PATH_MAX is defined. If neither POSIX.1-2008 nor PATH_MAX are available, error out. Change-Id: I8d2d256530d68884850535a6cd5908d1205035bc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Can find and launch an app bundle on MacShawn Rutledge2013-03-281-0/+9
| | | | | | | | | | | Required for https://codereview.qt-project.org/#change,51502 If qml is an app bundle, we'd still like to be able to launch it just as easily on the command line. Change-Id: I37973b296b1da9d27e7f3bfff1c54487bbb387ea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* argument -l is the same as -list-versions; double-dash is OK tooShawn Rutledge2013-03-221-2/+5
| | | | | | | | | Linux users tend to be accustomed to GNU-style options. Now qtchooser is agnostic about that. Change-Id: Idb9731cf6892c183370d863e4261936dc21e9ac8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add 'make distcheck'qtchooser-26-g97962d2Thiago Macieira2013-03-051-0/+5
| | | | | Change-Id: Ic081ead02951f95172723fc3fdf56ac7d6c9699e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Allow testing of any commit, not just HEADThiago Macieira2013-03-051-3/+4
| | | | | Change-Id: I95efda786155737b7513307b61e7d2263d021044 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Warn about recursive callsFrederik Gladhorn2013-03-051-14/+36
| | | | | | | | | | Calling qdbus took a long time and 100% cpu since I had a broken setup. Instead of doing that, warn that the user callls a symlink to qtchooser itself. Change-Id: I968a6d637f51bf8138e196207b7f3bbae17883f5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add license files as mandated by (L)GPL and referred from main.cpp.Timo Jyrinki2013-02-073-0/+1210
| | | | | | | | | | | | | | The files wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL Not sanitize-commit clean because those files aren't. Change-Id: I17e05b5afbb826a910866ee63a25ea1860f5c5c9 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add qdoc and qdoc3Timo Jyrinki2013-02-041-0/+2
| | | | | | | | Make qtchooser handle also qdoc and qdoc3, expected to be found similar to other tools by developers. Change-Id: Ie6bfb1d85fbdcb1919f107e97557ccc848f334cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Expand leading tilde in tool path (for e.g. ~/dev/qt5)Shawn Rutledge2013-02-011-18/+20
| | | | | Change-Id: I712d22a40e75a9f36ccb5709844547249c24bf7c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Simplify the getenv use and handle the empty $HOME caseThiago Macieira2013-02-011-11/+28
| | | | | | | | | | | | | | getenv(3) can return NULL if the variable isn't set. Some Standard Library implementations (like Clang's libc++) do not like a NULL as the argument to std::string's constructor, which is why the code is so convoluted as it is. Instead, simplify the code by having a getenv wrapper that has a default value. And handle the case of the empty $HOME: currently, if it isn't set, the application would crash. Instead, use getpwuid as a fallback. Change-Id: I0185dbc7b026a5978b678207b31de90cba531623 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Accept -run-tool if and only if the tool wasn't already selectedThiago Macieira2013-01-182-69/+79
| | | | | | | | | | That means we invert the order of overriding. Previously, -run-tool overrode the environment, which overrode argv[0]. Now, argv[0] overrides the environment, which overrides -run-tool. Change-Id: I60bd5e1397cb5a6cb8b0df9c1c3ebba6210ed920 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 21:04:12 +0000