summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* fix all "qt style yes options" which start with -lOswald Buddenhagen2013-03-151-18/+16
| | | | | | | | | | | | | | | | 7de9d3709 broke them, because suddenly every -l* switch was parsed as a library. fix this by re-arranging how the options are parsed. this obsoletes d7ab351cdd as well, by being more generic. fwiw, this syntax is stupid to start with, because all unknown -l* options are implicitly libraries and create confusing configure failures. emulating the compiler/linker command lines isn't such a great idea ... Task-number: QTBUG-29174 Change-Id: I11bac7a6f458664dff8cbe57ed9cd33a08d5e9ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* allow passing values with spaces to -device-optionOswald Buddenhagen2013-03-151-1/+1
| | | | | | | | | note that the value is written verbatim to the qmake file, so additional quoting may be required on the command line. Task-number: QTBUG-30102 Change-Id: I02ca9a44fae82b6932982e6385508b8a304cc1e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove extra $ in default libexec directoryEskil Abrahamsen Blomfeldt2013-02-251-1/+1
| | | | | | | | | Produces qt_lbexpath=$PREFIX/29677QT_INSTALL_LIBEXECS_DIRNAME in qconfig.cpp Change-Id: Ie6f208d759a748dfcd4f1547943a1dfb4b7aedd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* add -skip option to the configuresOswald Buddenhagen2013-02-201-1/+15
| | | | | | | | | | | | | | | this makes it possible to exclude modules from the build without moving their sources out of the way. substitutes the much-requested -no-webkit. not adding a symmetrical option, as it is relatively pointless: to build only specific "leaf" modules, you only need to run "make module-qt<module> ..." once you configured. and removing particular "intermediate" modules is achieved with this very option. Task-number: QTBUG-26697 Change-Id: I25cebdbd029885a2c653c4cde696f9bb78691768 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add QT_CONFIG's static/shared to CONFIG on startupOswald Buddenhagen2013-02-181-0/+2
| | | | | | | | | ... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Place libexec binaries into lib folder on WindowsKai Koehne2013-02-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default libexec directory to 'lib' on Windows for default configurations. This makes sure that e.g. qtwebprocess can actually find & load the right Qt libs. A separate libexec directory was introduced to avoid conflicts between a system-wide Qt in PATH and a custom Qt installation. However, since there are no system wide Qt installations on Windows this isn't an issue, but getting the executables to find its Qt libraries is. Alternatively we could have also placed it in the 'bin' directory. However, putting it in the 'lib' folder carries the notion that, unlike the binaries in the bin, the libexec executables might have to be deployed with a target application. The exception is when a separate archdata prefix is specified, and $$archdata/lib won't contain Qt libraries. In this case we use libexec like on the other platforms too. ChangeLog: [Qt for Windows] Fixed launching of QtWebProcess.exe by changing default libexec directory to 'lib'. Task-number: QTBUG-29661 Change-Id: Icbb15fb98474d6fef8ac9310f2e2b482d3282f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-01-251-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Disable only accessibility bridge without dbus on linuxFrederik Gladhorn2013-01-231-13/+17
| | | | | | | | | | | | Keeping accessibility and only disabling the bridge will enable more builds to work. Warning about disabling accessibility disabled is needed because in QStyle it is used to discover semantics about widgets (if a toolbutton is in a toolbar). Change-Id: Iae4e6ab63479743bdd70cba4b1954ec7cf3f88e9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* configure: disable GTK auto-detection on MacJ-P Nurmi2013-01-141-0/+5
| | | | | | | | Task-number: QTBUG-28769 Change-Id: I2f05fdf530cde8ae7ed1470a99acade6267e19e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Remove the framework directories from qmake's default include dirsThiago Macieira2013-01-141-0/+1
| | | | | | | | | | | | On Mac, GCC and Clang print "(framework directory)" at the end of the directory listing for includes if that's a framework dir. The directory with "(framework directory)" at the end does not exist, so it doesn't affect anything by being there. But we don't have to keep the list longer just for that. Change-Id: I3d031d3d15c75801ec0d6112b2c913bd63e5def3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update the sysconfdir default to non-absoluteThiago Macieira2013-01-041-2/+2
| | | | | | | | | Make the settings path to be relative to $prefix, instead of absolute. And update the configure -help output to match the actual code. Change-Id: I71e4ad6e3db046fec95ef057ae7f7bc566bc5794 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* slash the -fast configure optionOswald Buddenhagen2012-12-181-59/+0
| | | | | | | | | it's completely broken, and i have no time to fix it properly now. configure runs no qmake -r by default any more, so it's fast enough. Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add directwrite support to the configure scriptErik van Pienbroek2012-12-121-0/+17
| | | | | | | | | | | | | | | | | | | The configure.exe already supported the -directwrite flag for some time. This commit adds this flag to the configure script as well so environments which use MinGW as cross-compiler can now also optionally enable DirectWrite support. The original configure.exe pieces were added in commit c0fed43b04dec8bd549043d3ea5e28908128082c of the Qt4 repository. The directwrite argument which this commit adds to the configure script and the behaviour of it should be exactly the same as the current configure.exe. To get Qt built with DirectWrite support using the MinGW-w64 toolchain at least mingw-w64 trunk revision 5451 (Nov 10 2012) is needed Change-Id: I519718068cf5732c7ebcbf0a0fafb6b747db0bcf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Consistently prefix all platform plugin libraries with "q".Samuel Rødal2012-12-111-1/+1
| | | | | | | | | | | | | This means the xcb plugin library will be named libqxcb.so instead of libxcb.so, which doesn't clash with the system's libxcb.so. We need to consistently apply this on all platforms for static linking to work. Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* configure : remove .qmake.vars after status message.Elvis Lee2012-12-111-1/+2
| | | | | Change-Id: I3a4c1c10ce0d27d05faf64049224e0022a414fa4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.priMiikka Heikkinen2012-12-101-0/+5
| | | | | | | | | | | | | | | Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable to specify the default QPA plugin. "CONFIG += qpa_default_plugin" statement in application .pro file will add the default QPA plugin into QTPLUGINS. "CONFIG += qpa_minimal_plugin" statement in application .pro file will add the minimal QPA plugin into QTPLUGINS. Task-number: QTBUG-28131 Change-Id: I12a241005f30b37467d783b50f0369b47e605e68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove dead lineOswald Buddenhagen2012-12-061-1/+0
| | | | | | | the compile-all-mocs-as-one-file feature is gone for years Change-Id: I6c35bce59c36b6920af2498661172b5938eeba52 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move QT_{SOURCE,BUILD}_TREE back to .qmake.cacheOswald Buddenhagen2012-12-051-1/+0
| | | | | | | | | they cannot be legally used outside qtbase - it's the antithesis of modularization. Change-Id: I847844ea0ddce599f130f396d68cb61fa8f34135 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix -largefile option in configureLucas Wang2012-11-281-0/+4
| | | | | | | | | | -largefile is regarded as a library named argefile and added to Makefile as a link flag. It will cause a link error. Change-Id: I8ac30896d4e473f7e98c937c8906b1b9c620cf1e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-281-2/+14
| | | | | | | | | | | | | | | | | | User applications are those that users run directly, whether it be for development or not. The executable binaries that the user does not usually run but is still required for proper functioning are called "program executables" in Autoconf and they are placed in libexec. This commit adds support for "program executables" in Qt by adding the -libexecdir option to the configures, the qmake variable QT_INSTALL_LIBEXECS (note the plural, to match all other properties), and QLibraryInfo::LibraryExecutables. At the time of this commit, the only expected "program executable" is the QtWebProcess, the WebKit2 helper process from QtWebKit. Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* configure: clean up unused CFG_IMTasuku Suzuki2012-11-261-2/+0
| | | | | | Change-Id: I91a09e29a3bf79610a34c30ffe9c145c7e76d1b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Mac: Fix compilation with -sdk optionEike Ziller2012-11-231-5/+1
| | | | | | | | | | | | The include paths that the mkspecs set into the OpenGL/AGL frameworks must take the SDK into account. (The headers in 10.8 have slightly changed wrt 10.7, leading to compile errors because framework style includes (<OpenGL/foo.h>) within the system headers are resolved to the SDK framework headers.) Change-Id: I6113cdb95b462d587f593682e03e81e920f3f672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Added prepare_docs to qt_build_config.prf (it was added directly in configure in the source branch) Conflicts: configure tools/configure/configureapp.cpp Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-021-11/+29
| |\ | | | | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| * \ Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-261-6/+12
| |\ \ | | | | | | | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| * | | configure: make sure that global shadow doc symlink is always updatedTor Arne Vestbø2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We forcibly overwrite the symlink - in case the source dir changes. Change-Id: I3986b968f787ea0d250887113a0c223e10038546 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | | Add config option to build documentation as a two-step processTor Arne Vestbø2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Add a new location for QML 2.x importsThiago Macieira2012-11-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Add -archdatadir and change some of the default install dirs in Qt 5.Thiago Macieira2012-11-111-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Architecture-depedent Qt data defaults now to something under -archdatadir. Architecture-dependent data is everything that contains machine code (e.g., plugins) as well as anything that hardcodes build-specific data, like qconfig.pri and qmodule.pri. That is: QML imports: $archdatadir/imports (includes plugins) Qt plugins: $archdatadir/plugins (machine code) Mkspecs: $archdatadir/mkspecs (build-specific) Architecture-independent Qt data defaults now to something under -datadir. This option existed in Qt 4, but did not differentiate between arch-dependent and independent. Following Autoconf's lead, --datadir is the *independent* data root. translations: $datadir/translations (.qm files are arch-independent) docs: $datadir/doc By default, both new options are equal to the Qt install prefix. (Strictly speaking, for complete Autoconf compatibility, we'd need a --datarootdir=$prefix/share, --datadir=$datarootdir/qt5 and --docdir=$datarootdir/doc/qt5, but that's just nitpicking and unnecessary) Change-Id: I39c886a6a2d2d2c0b11923c50974179e21f2af76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | delete -prefix-install configure optionOswald Buddenhagen2012-11-101-75/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the only thing -no-prefix-install did was changing the install path defaults on mac. and the result didn't work particularly well. Change-Id: Iadd0f4b494b6920b595e184f858ef810f5222b0c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Accessibility Linux: Do not depend on external libatspi2Frederik Gladhorn2012-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has (and still does) caused lots of grief since it means accessibility was often unintendedly not built. Instead copy the lib-at-spi-2 header file needed for the type enum and build it by default again. Change-Id: I1ba26f20edff1aeb444c96a37928f36230ac7576 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | | | Add configure option to minimize xcb runtime dependenciesKai Koehne2012-11-071-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the xcb- libraries we depend upon are not (yet) common across distributions. This is problematic for binaries that should be working on different distributions. The patch mitigates this by: Adding the files from libxcb-proto (version 0.1.6), compiled with libxcb-1.5 xcb-util (version 0.3.9) xcb-util-image (version 0.3.9) xcb-util-keysyms (version 0.3.9) xcb-util-renderutil (version 0.3.8) xcb-util-wm (version 0.3.9) from xcb.freedesktop.org/dist to src/3rdparty/xcb. Adding a configure option '-qt-xcb' to use the sources instead of linking to the respective runtime libraries. Task-number: QTBUG-27803 Change-Id: I6ea87daa382871b2b9072a601511523fa0b9f44b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | Resolve xcb_poll_for_queued_event at run-time.Samuel Rødal2012-11-071-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not making this a compile time decision we ensure forward compatibility for older xcb versions if the xcb plugin is built against a newer xcb. Change-Id: I744777d53bf7b8deb6eff372494f4403d19d364c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | | move invariant CONFIG flags out of the configuresOswald Buddenhagen2012-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we now have qt_build_config.prf which can contain static code. Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | remove pointless messing with CONFIG+=fix_output_dirsOswald Buddenhagen2012-11-021-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | the function is automatically performed by debug_and_release.prf, regardless what we do with this flag. Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | move remaining configure'd CONFIG flags to qmodule.priOswald Buddenhagen2012-11-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | so they are uniformly available to all modules. Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | rewrite default spec handlingOswald Buddenhagen2012-11-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-301-0/+21
| |/ |/| | | | | | | | | | | | | | | | | | | | | This option is opt-in (default: no). When configured with "-proxies-system-default", Qt automatically picks up the system proxies. Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | configure: make sure that global shadow doc symlink is always updatedTor Arne Vestbø2012-10-221-1/+1
| | | | | | | | | | | | | | We forcibly overwrite the symlink - in case the source dir changes. Change-Id: I3986b968f787ea0d250887113a0c223e10038546 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Remove Cleanlooks and PlastiqueJens Bache-Wiig2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Made xcb plugin work when the GLX extension is not present.Samuel Rødal2012-10-191-0/+6
| | | | | | | | | | Change-Id: I9285d7524586ff404206c088019ece33335137d9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | configure: state compiler explicitly when testing for supported flagsPeter Hartmann2012-10-191-5/+5
|/ | | | | | | ... so we can test those functions with host and cross compilers. Change-Id: Ifebfdac54580633c797f77b139514cf9d66edd8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Rename the syncqt -qtdir to -mkspecsdirThiago Macieira2012-10-191-1/+1
| | | | | | | | | It's actually looking for the mkspecs (so it can read qconfig.pri to get the Qt version), so give it exactly what it wants. Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introduce new style FusionJens Bache-Wiig2012-10-181-1/+1
| | | | | | | | | | This is a new non-native style for Qt. It is intended as a replacement for the now aging Plastique and Cleanlooks styles. Change-Id: I30c0518a69e4e3b8b2b05ee7d84c3a5a1f307578 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* add a .qmake.conf file which load()s qt_build_configOswald Buddenhagen2012-10-181-1/+0
| | | | | | | | | | | | | | that way we don't have to auto-generate code for that in the configures. note that we now load qt_build_config.prf instead of just qmodule.pri, which means that exceptions_off is set everywhere. we forcibly re-enable them for testcases to minimize the deviation from default 3rd party usage. testlib selftests are not qt testcases, so the one that needs exceptions needs to enable them explicitly. Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove mention of freetype options in configure.Samuel Rødal2012-10-171-5/+0
| | | | | | | | | | These options were only used for QWS in 4.x, and their documentation should have been removed as part of f220f99a6d13a395ca723e9f9. Task-number: QTBUG-27369 Change-Id: Ia85a20bdac40087c02f6876f53ce21568759d697 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove apparently dead CONFIG+=dylibOswald Buddenhagen2012-10-161-1/+1
| | | | | Change-Id: Ib7d1739e6a283bb93179345adb9470ac1f064ec8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Mac OSX: configure will use clang for any version >= 3Shawn Rutledge2012-10-131-4/+2
| | | | | | | Task-number: QTBUG-26140 Change-Id: Ifee00a9d15b053bb9d2c7b0d9bedca45e4d589d3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Modularize documenation buildTor Arne Vestbø2012-10-101-3/+3
| | | | | | | | | | qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global includes, instead of using relative paths. Qt modules will automatically get a doc target that builds and installs into the right place (including supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module). Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>