summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Use $CFG_ARCH even if src/corelib/arch/$CFG_ARCH does not existBradley T. Hughes2012-02-041-23/+0
| | | | | | | | | | | | | Recent commits in src/corelib/arch have removed empty directories, which cause configure to assume that the architecture is not supported. This assumption is wrong, due to changes in src/corelib/thread/qbasicatomic.h to include the correct QAtomic* implementation based on compiler pre-defined macros instead of the architecture found by configure. Change-Id: I026958fb9af8af62e295e68a4643c37ac9395dc6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add support for QNX iconv implementationRafael Roquetto2012-02-031-2/+2
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. Change-Id: I8654703e46b9c64503aca5521ce7fae1c97d7968 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make Clang the default makespec on Mac OS 10.7 (Lion) if Clang >= 3.0Tor Arne Vestbø2012-02-031-2/+15
| | | | | | | | | | | | Change-Id: Ibeb1db0eca2fb6d843d85c3f48c5f23a81230745 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Change syncqt default parameters for shadow buildingKalle Juhani Lehtonen2012-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | For shadow builds configure creates syncqt script to shadow build directory tree calling the original syncqt from qtbase source tree. This wrapped script will add two default parameters when calling the original script. Both parameters are overridden in qtbase/mkspecs/features/default_pre.prf and are not needed except by configure script itself in latter stages where the parameter should be applied explicitly in shadow build condition branch. In addition, it adds the qtdir parameter for the forwarded syncqt call to indicate the location of qt sources for the syncqt. This also will give correct qmake path for qtmodule-configtests script triggered from syncqt. Changes are done both for Linux and Windows configure. Change-Id: I307b2e76c203ee14b849f10ff629f9668da2f223 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moving tiff image format support and libtiff out of qtbaseaavit2012-01-311-52/+1
| | | | | | | | | | The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian specific code from qtbase.Xizhi Zhu2012-01-311-3/+0
| | | | | Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix bash-ismOswald Buddenhagen2012-01-301-1/+1
| | | | | Change-Id: Ibc560b2cc57e30f3f966bb939b356d6eb0762ec8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dead code from the configuresOswald Buddenhagen2012-01-301-459/+63
| | | | | | | | | | | | | | | This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QRegularExpression: configure support for PCREGiuseppe D'Angelo2012-01-261-0/+34
| | | | | | | | | Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the 'macosx' archBradley T. Hughes2012-01-261-23/+9
| | | | | | | | | | | | | The new atomic implementation chooses which header to include based on what #define's are set by the compiler (i.e. __x86_64__ or __i386__). Because of this, the qatomic_macosx.h header isn't used anymore. This also means that the configure script does not need to use or look for this file anymore, it should just use the normal uname -m detection. Change-Id: Ibf275488735483268286196952299c0e496dfd1f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-251-50/+2
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Set macosx-version-min in common Mac OS X mkspec instead of configureTor Arne Vestbø2012-01-231-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | When set in configure it would be written to .qmake.cache and would only apply when building Qt. We then had an override (that was also out of sync, version-wise) in the g++ mkspec, which would also apply to apps building agains Qt. This override did howerver not apply when using the Clang mkspec. We now move setting macosx-version-min to the common macx mkspec, shared by both g++ and Clang, which will apply both when building Qt and when building something against Qt. The latter since an application built against Qt will not deploy on versions of Mac OS earlier than 10.6 anyways, so we might as well always set the minimum-version. The modifications to the mkspecs will result in macosx-version-min being passed twice when compiling qmake, as configure writes its own makefiles and the mkspec parsing in configure has a bug where it will lazily evaluate qmake-variables instead of evaluating them inline. This is not a problem, and can be fixed in a later patch if seen fit. Change-Id: Ib29503ad00a9dc00e0a50b0dbd9459e89a20dfbd Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-231-1/+1
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix cross building mingw: doesn't need to pass qpa testMark Brand2012-01-191-1/+1
| | | | | | Change-Id: I4b40d122db81506bb2ad85db459f806ac93f8cbd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* do not detect or configure iconv for WindowsMark Brand2012-01-171-1/+1
| | | | | | | | | | | | Qt doesn't use iconv on Windows, but configuring it will appear to work and the build will complete. The result is that character set conversions do not work. Configure.exe already disables iconv for Windows. Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Don't enable V8's snapshot feature when building inside scratchbox for ARMTor Arne Vestbø2012-01-111-0/+5
| | | | | | | It will result in QEMU crashing. Change-Id: Ie2f607b6335ae0d08b9a6d67acc22ea666bcd780 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove universal build support from configure.Morten Sorvig2012-01-111-206/+16
| | | | | | | | | | | | | | | | | | Qt 5 will support single-arch builds only, for two reasons: 1) PPC is very deprecated at this point, x86_64 is becoming standard. 2) V8 only supports single arch builds. As a workaround, build twice and use lipo to create universal binaries. This commit also removes the -cocoa and -carbon options. Change-Id: I428f096a02f59ec2b3e693150e0e08358198de83 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove ICD plugin for bearer.Xizhi Zhu2012-01-101-38/+0
| | | | | | | It's only used by Maemo and Harmattan, thus not needed in Qt5. Change-Id: I8638f4fc63637be88d1aa584cde7e3a4116f2de6 Reviewed-by: Alex <alex.blasche@nokia.com>
* Add a new QT_NO_SSL feature macro.Richard Moore2012-01-061-1/+1
| | | | | | | | | | | | | | | | | At the moment users of Qt must detect if it was compiled with SSL support by testing for QT_NO_OPENSSL. This means that any code that is conditionally compiled this way is tied to the presence of the openssl backend. This commit makes it possible to implement new SSL backends during the Qt5 lifetime without breaking this code. People can still test for QT_NO_OPENSSL if they really need openssl, but if they simply want to know if there's SSL support at all they should use this define instead. In addition, this commit changes the public API headers to use the new define. Change-Id: Ib57a71aa65836ac9351f120a487bfeb8009d9515 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Added xrender as a dependency to build glxconvenience.Samuel Rødal2012-01-061-1/+19
| | | | | | | Prevents build errors when xrender is not present. Change-Id: Ib80d52109dd0bcd63ba865c5f6e143961f3c20e6 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* configure: Remove -nokia-developer optionKai Koehne2012-01-041-19/+3
| | | | | | | | | | There's no good reason to still differentiate between 'Nokia' developers, and Qt developers outside of Nokia, inside configure. Just use -developer-build -opensource -confirm-license. Change-Id: I8726947dae0c70412eb52bf9d88eda4aa061ef26 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Finish removing Qt3 supportBradley T. Hughes2011-12-231-40/+2
| | | | | | | | | | | | | | | | Remove the (-no)-qt3support options from configure, and remove the last remaining references to Qt3Support, QT3_SUPPORT, and QEvent::ChildInserted. The compatibilityChildInsertEvents() tests in tst_QObject and tst_QWidget have been renamed to childEvents(), which is a more appropriate name. Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* configure[.exe]: use create_prl, link_prl for all modulesRohan McGovern2011-12-211-1/+3
| | | | | | | | | | | | These should go into qmodule.pri, rather than .qmake.cache, as they make sense for all Qt modules - not only qtbase. Fixes link failure when building qtdeclarative with jom on Windows. Change-Id: I3e8b207e1808cb23af58b865a160c2fafa906288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove -graphicssystem (and -runtimegraphicssystem) options from configure.Robin Burchell2011-12-141-71/+0
| | | | | | | | | | In a Qt 5 world, these have no relevance, so remove them. Task-number: QTBUG-23022 Change-Id: I2f52c7aa1fcb8234046dd95b4d702791d20514fa Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* document the -force-asserts switchHarald Fernengel2011-12-081-0/+3
| | | | | Change-Id: I6af833625d94be98ffebbdecff725f4669e7cbc6 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove ptmalloc from source treeJoão Abecasis2011-12-081-24/+1
| | | | | | | | | | | | | | | | | | | This malloc-replacement library is marked experimental and disabled by default. It is also Unix-only. On linux (GNU C library, actually) ptmalloc graduated to become the native allocator, according to its webpage (http://www.malloc.de/en/), making the need to have a copy here significantly lower. Anyway, there is nothing preventing interested parties from adding this library to their own setup and very little value in keeping it around in qtbase. Change-Id: I2b1c798ca38b59bb767b44d6e5190080ec6ecdf4 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make reduce-relocations the default if supportedLars Knoll2011-12-071-1/+1
| | | | | | | | | | | reduce-relocations will enable the -bsymbolic-functions linker option when supported by the linker. This reduces the amount of relocations required within a shared library, by binding symbols locally where possible. Change-Id: I00ddc408df79097857d6b36f7fc1b0f510362fcc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* v8: Be able to build V8 for MIPSHolger Hans Peter Freyther2011-12-011-1/+1
| | | | | | | | Add mips to the list in configure and the v8.pri, build the existing MIPS files. The result has not been verified to work. Change-Id: I0f4fd29cd9752d32b6d87e0df0e888822f40ac0a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Added build system support for installing tests.Rohan McGovern2011-11-231-2/+24
| | | | | | | | | | | | | Tests will install under $$[QT_INSTALL_TESTS]. TESTDATA may be used to install additional testdata required by the test. The default install rule may be disabled by CONFIG+=no_testcase_installs. Change-Id: I204de60c8e844775906ffd016ca50bffbb414142 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add V8 snapshot supportKent Hansen2011-11-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* configure: clean up whitespace, comments.Rohan McGovern2011-11-181-24/+13
| | | | | | | | | | Make the indentation sensible. Remove comments which merely repeat the name of a variable on the next line. Change-Id: Ic3ecaaaba61795aeee10299ee44523eb725ecad9 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Integrate testcocoon support into Qt build system.Rohan McGovern2011-11-151-1/+8
| | | | | | | | | | | | To instrument a Qt application or library with the TestCocoon coverage tool, do `CONFIG+=testcocoon' in the application .pro file. To instrument Qt itself with testcocoon, use the `-testcocoon' configure option. Change-Id: Ie77109a078d11ea51f7a073621e0df9c752c44ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add a -force-asserts option to configureHarald Fernengel2011-11-111-1/+13
| | | | | | | | | | | We have the following scenario: Either you build a release package without asserts, or a debug package with asserts. However, in embedded development, we need asserts also in release packages. This flag allows you to build a release package, but Q_ASSERTs still fire. Change-Id: Icd1dd4dd63c3cafecf515b40741263d902ad42d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* The value of the -sysroot option of configure was not getting set correctlyKevin Simons2011-11-081-1/+1
| | | | | Change-Id: I35f7b87e1fa176358b85bca646fbf1a388cb77a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove symbian support from configureJoerg Bornemann2011-11-071-336/+97
| | | | | Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Append -W* configure flags to QMAKE_C*FLAGS_WARN_ONBradley T. Hughes2011-11-011-3/+3
| | | | | | | | | | | ... instead of adding them to all C*FLAGS. This makes it possible to pass -Wno-warning-name to configure to disable certain warnings enabled by default (which didn't work previously). This also has the added benefit that only projects that have CONFIG+=warn_on will get the extra warning flags. Change-Id: I7bbc100155e02e7ccb9ac3be14bd8f585b7bc39b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make configure understand -W* argumentsBradley T. Hughes2011-10-271-0/+15
| | | | | | | | These will be passed on as extra C*FLAGS to the Qt build. Useful for adding -Werror or -Wno-something-or-other. Change-Id: Ifbbf63261573edd024de951082d99658eb443a3f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the default install path point to /usr/local/Qt-$VERSIONLars Knoll2011-10-211-15/+1
| | | | | | | | | | | Remove Trolltech from the default install path. Since QPA is the default now, so we don't need to treat it specially from regular Qt versions. It is the regular Qt version. Change-Id: I0bde75c90d2d5944be192e1249bc1a9371c70fcb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add multipoint touch support for Harmattan to the xcb platform plugin.Jocelyn Turcotte2011-10-171-1/+54
| | | | | | | | | | | Proper multipoint touch support was only introduced in XInput2.1, but Harmattan uses a tweaked version of XInput2.0 that transfers touch data through mouse events. This patch applies on the xcb plugin a subset of the changes that were applied on the Qt 4.7 that was shipped to Harmattan to get similar multipoint touch support. Change-Id: Ifda7ad40de29d7ded1443d4f78b3ec3807303a9f Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-10-121-0/+4
| | | | | | | | | | | | | | | | | | Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config. (cherry picked from commit 53794d94994cb3149581b1a91762dfa2d6defac0) Change-Id: I53794d94994cb3149581b1a91762dfa2d6defac0 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-on: http://codereview.qt-project.org/6488 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Exclude qtconcurrent tests via .pro files.Jason McDonald2011-10-121-0/+2
| | | | | | | | | | | If Qt is built without QtConcurrent, the relevant autotests should be excluded from the build, rather than building empty tests that appear to pass and thus produce confusing test results. Change-Id: I43bafcb0ffa42e8981bec4e27bf6a23a28d86df9 Reviewed-on: http://codereview.qt-project.org/6395 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't default to XCB if it is not enabled.Lincoln Ramsay2011-10-071-0/+2
| | | | | | | | | | | Default to wayland unless it's not enabled. Default to minimal otherwise. Change-Id: I0fa523eae395821a7cb0cabbb27ca073e594246f Reviewed-on: http://codereview.qt-project.org/5945 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Logic does not match error message.Lincoln Ramsay2011-10-061-1/+1
| | | | | | | | | | Passing -no-xcb or -no-wayland was enough to get a build with neither but the error message says you need to pass both. Fix the logic. Change-Id: I2d554d371b603e7df7bc07e1b4d5271ba31243f0 Reviewed-on: http://codereview.qt-project.org/6099 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* A QPA build on Linux requires xcb or waylandLincoln Ramsay2011-10-061-0/+16
| | | | | | | | | | | | Require the user to pass -no-xcb and -no-wayland in order to produce a build that has only the minimal plugin available. This prevents "useless" builds from being accidentally created. Change-Id: If2f7f516a52b75998f3ae7bf802f89f93f6e8218 Reviewed-on: http://codereview.qt-project.org/6005 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* If -xcb is passed and we can't enable xcb, dieLincoln Ramsay2011-10-061-0/+6
| | | | | | | | | Needed to resolve issue QTBUG-21486 Change-Id: I5493cfa73f0433fda60fb0dd850380021e13b928 Reviewed-on: http://codereview.qt-project.org/5944 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Show the -xcb default properly.Lincoln Ramsay2011-10-061-6/+6
| | | | | | | | | | The * was not appearing against the default for the -xcb switch because of a spelling mistake. Change-Id: I3491cc9772d02179711b0d474db7ab2ef2398e88 Reviewed-on: http://codereview.qt-project.org/6003 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* make it possible to disable wayland supportOswald Buddenhagen2011-10-041-13/+43
| | | | | | | Change-Id: I8640b5fdc0f2a20d7349f7a43e61e6b37f59d3a0 Reviewed-on: http://codereview.qt-project.org/5334 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove the remaining traces of QT3_SUPPORTLars Knoll2011-10-031-3/+0
| | | | | | | | | | The only place that now still knows about it is moc, so it can still parse old headers. Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f Reviewed-on: http://codereview.qt-project.org/5755 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>