summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap/bootstrap.pri
Commit message (Collapse)AuthorAgeFilesLines
* Generate a proper static QtBootstrap moduleOswald Buddenhagen2012-11-081-65/+0
| | | | | | | | | | | Making a properly installed libQtBootstrap simplifies our tools build process a little and in addition allows other comand line tools to use the bootstrap lib and link against it. Initial-version-by: Lars Knoll Change-Id: Iddf4568a5505bc24898ec1abf7e7022e19f0a454 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* purge dead definesOswald Buddenhagen2012-11-011-1/+0
| | | | | Change-Id: I8770416a19fb0951c0096cedf3f36c3493437903 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QDoc/Bootstrap library: fix link error on WindowsPierre Rossi2012-10-091-1/+1
| | | | | | | QSettingsPrivate on windows requires advapi32. Change-Id: If4de132827398033c7bb588f6f19bc6fe9619286 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* build host tools in release mode againJoerg Bornemann2012-07-311-4/+1
| | | | | | | | CONFIG does not contain build_all anymore, thus we need to check QT_CONFIG in bootstrap.pr{i,o}. Change-Id: Ia505fa101adc49f185908ca575d3211caed612db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up the use of QT_NODLLThiago Macieira2012-06-281-2/+0
| | | | | | | | | | QT_NODLL is replaced by QT_STATIC, but the latter is implied if QT_BOOTSTRAPPED is already defined. Therefore, simply remove the QT_NODLL definitions. Change-Id: Iac7ec0b494b7a78197c25d59547f45eaf92d7465 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't refer to module versions during bootstrapOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | | once we auto-generate the pris while building their respective modules, the versions won't be available during bootstrap yet. however, as these are core modules, their version is locked to the global $$QT_VERSION anyway, so just use that. Change-Id: I092f5e7d4dfe99c03e0df71f9409cac9be9f2297 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix compilation on Linux: link to zlib in the bootstrapped tools.Thiago Macieira2012-05-221-2/+1
| | | | | | | | | That "else:" with no first condition is probably throwing qmake off. The condition was removed in ad2930f82536c9f5d38b644c5a070ce1248f6ee2. Change-Id: I6af36e3f673a65a6152fb467162c25afc13b4196 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-171-0/+1
| | | | | | | | | | | | | This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove -DQT_NO_STL from the bootstrapped buildsThiago Macieira2012-04-071-1/+0
| | | | | Change-Id: I37ea06426b66e617a49ec46952abdaad8814eadf Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include geometric variants when bootstrapping.Stephen Kelly2012-03-171-1/+0
| | | | | | | | They are needed by the qdbus tools. Change-Id: Ia1994f6a9bfa2ce1d526fd3e49370fd188ce5972 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* bootstrap: remove QtXml dependencyGiuseppe D'Angelo2012-03-141-7/+2
| | | | | | | | | | Only qdoc is now using QtXml classes, so just add them to qdoc.pro and drop them from the bootstrap library. Change-Id: I821839396141d1d7a2ada565a513aa46c54c9620 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add JSON support to the bootstrap libraryLars Knoll2012-02-151-1/+1
| | | | | | | | | | | The JSON support will get used in moc to support the creation of plugin metadata that's embedded into the plugin itself. Change-Id: I3bc52b16ca0a43bc8bf9141b450045c6183b7823 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove Symbian code from tools.Xizhi Zhu2012-01-301-1/+0
| | | | | Change-Id: Id9d7b2b4f6bc8b558f92bc09b7956c49e5a3752a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove unused QT_NO_TEXTSTREAM.David Faure2012-01-111-1/+0
| | | | | | | | It was checked in a few places, but it didn't actually remove QTextStream, so it was pretty useless. Change-Id: I8eaf28893cd6c7acbe1c0b69d58de90742aee755 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-0/+4
| | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+76
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