summaryrefslogtreecommitdiffstats
path: root/src/tools/tools.pro
Commit message (Collapse)AuthorAgeFilesLines
* remove pointless directory referencesOswald Buddenhagen2012-12-041-7/+7
| | | | | Change-Id: Ice43a3d3eeab5ada35e1439e055eb7b709d66c83 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add config option to build documentation as a two-step processTor Arne Vestbø2012-10-251-3/+3
| | | | | | | | | | | | | | | | | | | | The new 'prepare_docs' CONFIG option triggers the documentation rules in default_post to generate two extra targets: prepare_docs and generate_docs. The prepare_docs stage runs qdoc with the -prepare option, which means qdoc will only generate index files, and the generate_docs stage will call qdoc with -generate, which reads the index files and generates the final output. The regular docs target will then run the prepare_docs target for all submodules before running the generate_docs target. This ensures that when generating the final output, qdoc has all the index files for all the other modules available, to be able to resolve cross-references between the various Qt modules. This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so that the root Qt5 build will be able to hook into this new behavior. Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Centralize place where we ensure qdoc is built before generating docsTor Arne Vestbø2012-10-101-0/+7
| | | | | Change-Id: Ie0220d3c76990f6052edcd8c738e4e2807f35c71 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* disable building uic when -no-widgets is setTasuku Suzuki2012-07-041-1/+1
| | | | | Change-Id: I86040ec086621913fefcf6d349fe603758991c4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't compile the host tools for wince already in configureOswald Buddenhagen2012-06-271-1/+1
| | | | | | | | qmake can now produce proper mixed-target projects Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* detach src/src.pro and src/tools/tools.pro from qtbase.proOswald Buddenhagen2012-06-191-2/+1
| | | | | | | | | they were included instead of being proper subdirs. this doesn't appear to be necessary for anything at this point. Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove convoluted recursive debug/release target magicOswald Buddenhagen2012-06-191-39/+0
| | | | | | | | this has been a) dysfunct and b) unnecessary for *quite* a while. Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Change-Id: I5d658a15d0c1dc923002f8d773eecb8382cd213d
* Bootstrap qdbuscpp2xml.Stephen Kelly2012-03-181-1/+4
| | | | | | | | | This involves invoking the Moc classes directly and using the data structures it provides instead of invoking the moc exectutable and parsing the generated code. Change-Id: Ia5c654e8ef58d52d0d3376252c13e13885f80da3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bootstrap qdbusxml2cppStephen Kelly2012-03-181-0/+8
| | | | | Change-Id: I06856b169d5ee4f99fcf9c87ce88cb5ac34568e8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREEOswald Buddenhagen2012-03-081-4/+4
| | | | | Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Move qdoc into qtbase and bootstrap itLars Knoll2012-03-081-1/+4
| | | | | | | | | | | | | | | | We need qdoc in qtbase to be able to properly modularize our documentation and build it when building the different Qt modules. qdoc does contain a copy of the qml parser from qmldevtools, but this is the lesser evil compared to how we are currently forced to genereate our docs (and the fact that no developer can run qdoc and check the docs for their module). Change-Id: I9f748459382a11cf5d5153d1ee611d7a5d3f4ac1 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* don't abuse $$fromfile() for inspecting entire projectsOswald Buddenhagen2012-02-291-2/+2
| | | | | | | | | | a project can rightfully expect a sane environment. $$fromfile() does not necessarily provide that. so instead use include() with a target namespace. Change-Id: I8d6d30ab1b760d4930c9b4453bc92f8f8ad0b0ae Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove over-uses of $$list()Oswald Buddenhagen2012-02-271-2/+2
| | | | | | | not sure why anyone would do *that* ... Change-Id: Id91e9e8bd602a9d9275ade2ca86aaa4f4698ff72 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove Symbian code from tools.Xizhi Zhu2012-01-301-35/+33
| | | | | Change-Id: Id9d7b2b4f6bc8b558f92bc09b7956c49e5a3752a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove QtV8 library from QtBaseSimon Hausmann2012-01-091-3/+0
| | | | | | | | | | The QtV8 library is going to live in the qtjsbackend module. Change-Id: I72251316163829411dda998b9503ce6f75b3606a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add V8 snapshot supportKent Hansen2011-11-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QtBase: Move idc to Active Qt.Friedemann Kleint2011-10-101-3/+1
| | | | | | | | | Remove include path to Active Qt from qt.prf. Change-Id: I476152ce56e47b573f5c835ec1347e772c4e9c3e Reviewed-on: http://codereview.qt-project.org/6355 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix build from scratch on Windows.Friedemann Kleint2011-05-241-4/+0
| | | | idc needs corelib (should be moved to ActiveQt later).
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-4/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+73
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12