summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Configure: Set separate_debug_info for all modulesKai Koehne2011-08-161-2/+2
| | | | | | | | | | | | separate_debug_info was previously stored in .qmake.cache, and therefore only affected qtbase. Store it as a QT_CONFIG setting instead, and add it to CONFIG for all Qt plugins and modules. Change-Id: I940c8cb30f1c42c85f4d0342e6a482f20677ff04 Reviewed-on: http://codereview.qt.nokia.com/2975 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* configure: fixed usage of rpath on macRohan McGovern2011-08-111-1/+1
| | | | | | | | | | This logic should be used for all mac platforms. Currently it is erroneously skipped for qpa on mac. Change-Id: Ibc8e0bb38d4c08f48292639c614bc328c703b1bc Reviewed-on: http://codereview.qt.nokia.com/2836 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* configure: fixed debug-and-release default for qpa on macRohan McGovern2011-08-101-17/+17
| | | | | | | | | | | debug/release is always supposed to default on for platforms where debug/release affects linkage (i.e. mac and windows). Previously, it did not correctly default on for qpa mac builds. Change-Id: I8d3c418f3fb787136ab120872fdd4d2ebf82c90e Reviewed-on: http://codereview.qt.nokia.com/2796 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix obsolete contact emailJason McDonald2011-07-281-1/+1
| | | | | | | | | | | Replace the old Trolltech contact email address with the current Qt contact email address. Task-number: QTBUG-20370 Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363 Reviewed-on: http://codereview.qt.nokia.com/2153 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* configure: fixed setting of CFG_MAC_ARCHS for mac qpa buildsRohan McGovern2011-07-281-3/+3
| | | | | | | | | | | | Previously, the mac arch was only put into qconfig.pri for carbon and cocoa builds. Make sure it is also available for qpa builds. This is needed for projects which need to select architecture-specific sources in their .pro file. Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a Reviewed-on: http://codereview.qt.nokia.com/2313 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Try to make sure the config test script is installed.Michael Goddard2011-07-261-1/+1
| | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Always assume IPv6 supportMarkus Goetz2011-07-041-30/+0
| | | | | | | | | | | It's 2011 baby! And until Qt5 is released probably 2012 :-) Change-Id: I397aabf25e93c8afb5f562636710985cf0c7acfa Reviewed-on: http://codereview.qt.nokia.com/1008 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> Reviewed-by: Markus Goetz
* Turn off Qt3 support by defaultLars Knoll2011-06-291-1/+1
| | | | | | | | | | | All QT3_SUPPORT functionality will go away with Qt 5 in any case, so let's turn it off in configure now. Change-Id: Ic8cf483704ad0f1484b2cda097b8e0c915ff2bef Reviewed-on: http://codereview.qt.nokia.com/824 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Remove all references to demos.Casper van Donderen2011-06-231-28/+5
| | | | | | | | | | | Remove the references to demos from configure and qtbase.pro. This is done because of the merge of the demos and examples in Qt. Everything will be added as an example. Change-Id: Iec040f5c719384c7aabba971316de40195ed3a69 Reviewed-on: http://codereview.qt.nokia.com/619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moved certain qmake config variables to .qmake.cache.axis2011-05-311-23/+20
| | | | | | | | | | | The reason is that these are local to the build, and should not be present inside the qmodule.pri file, because this file is installed. Change-Id: I2207f2bf068b1aafd14e60d106c7028ca53d5efd Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/238 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-241-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Enable configuration for XcbEckhart Koppen2011-05-181-1/+22
| | | | | | | | The xcb platform plugin can now be enabled using -xcb at configuration time. A configuration time compilation check will be added at a later point. Reviewed-by: Samuel Rødal
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-161-3/+1
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Update configure to enable QtConcurrent for Symbian
| * Update configure to enable QtConcurrent for SymbianLiang Qi2011-05-161-3/+1
| | | | | | | | (cherry picked from commit 5fc99e9f8e3b24c712d1673d3b55afa8c8090cb4)
* | Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently, an attempt to compile Qt even with -no-gui on a Linux box that doesn't have libX11 installed fails becaue of the XLib functionality check in configure. This check can be turned off in -no-gui mode, since QtCore, QtXml, QtNetwork and friends don't use libX11. Merge-request: 1214 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 912b6804bcacbf1b4f356d947986df8156a545a4)
* | Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1
| | | | | | | | | | | | | | Backslash escapes normally requires "-e" option to echo Reviewed-by: Jørgen (cherry picked from commit 68f37a29f911fce5bcdd285b1fc1bc6d4868d78e)
* | tests: enable compilation of autotests for qtbase by defaultRohan McGovern2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | Tests are now treated like examples and demos: compiled by default, unless you configured with `-nomake tests'. (They are still not installed by default, however.) Reviewed-by: Jason McDonald Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
* | Add qglobal.h exports for QtLocation & QtSensorsAlex2011-05-091-0/+33
|/ | | | | | Plus the QtLocation configure options Reviewed-By: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-2/+2
|\
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-2/+2
| | | | | | | | | | | | | | 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.
* | Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-291-1/+15
|/ | | | | | | | | | | | | | | | | | | | It's possible to enable HarfBuzz text layout on Mac by either: - Set QT_ENABLE_HARFBUZZ environment variable when running a Qt app. - configure with -harfbuzz to build Qt, then HarfBuzz support will be turned on by default. HarfBuzz will only be used when the font explicitly requested is supported by HarfBuzz (aka. TrueType/OpenType font), other fonts (AAT fonts) will still be handled by Core Text. Using HarfBuzz for text layout will hopefully solve most tricky complex text shaping bugs on Mac. Task-number: QTBUG-17728 Reviewed-by: Eskil
* Build examples and demos in qtbaseMarius Storm-Olsen2011-04-271-1/+1
|
* Extended module profiles.axis2011-04-271-28/+31
| | | | Each module now sets the QT_CONFIG variable itself.
* Make syncqt use sync.profile files from each moduleMarius Storm-Olsen2011-04-271-2/+1
| | | | | The sync.profile replaces the hardcoded paths inside syncqt, and enables it to work for other modules than just qtbase.
* Expose source and build directories for QtBaseMarius Storm-Olsen2011-04-271-26/+43
| | | | Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-3/+3
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+9132
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