summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove -arch argument and #define QT_ARCH from configuresBradley T. Hughes2012-03-131-213/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Check for PKG_CONFIG_LIBDIR when cross compiling.Girish Ramakrishnan2012-03-121-4/+4
| | | | | | | | | | | | | | | | When cross-compiling, check for PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH. pkg-config searches for pc files in PKG_CONFIG_PATH *and* the compiled in defaults (/usr/lib/pkgconfig). This means that pc files from the host get found when cross-compiling. Setting PKG_CONFIG_LIBDIR makes pkg-config search only in the path set in PKG_CONFIG_LIBDIR. Documented in the url below: http://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal Change-Id: I22dbf29c5691572b7cb8a5fce712ae7ba811670e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove redundant wayland stuff from QtBaseJørgen Lind2012-03-121-56/+18
| | | | | | | | | | | Config checks are done in the module. We pick up the pkg-config stuff also in the module. There shouldn't be a need to do this in configure anyway Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't define QT_NO_CORESERVICES on all platforms. That's just annoyingJørgen Lind2012-03-121-4/+6
| | | | | Change-Id: Id814bd0956b97c84ff0e6fcae8e5f22394c433e7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* rip out -incremental from configureOswald Buddenhagen2012-03-121-25/+1
| | | | | | | the feature is rather obscure and unlikely to be used by anyone. Change-Id: I2dfb4ca4d5d1f210d385c013f46bc6389fd6ea2d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove erroneous never referenced QT_NO_GUI defineDonald Carr2012-03-091-2/+0
| | | | | | | | | Logic was clearly always off kilter, and this was only defined for GUI builds Change-Id: Ie85c156510e7c450a5192408b4c365ff07ce2029 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qws: Remove decorations/kbd/mouse plugin support from configureHolger Hans Peter Freyther2012-03-091-138/+4
| | | | | Change-Id: Iaca207ed892b2f5f5d1650ed27007532a172544c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* do not copy/symlink qmake to build dirOswald Buddenhagen2012-03-091-23/+1
| | | | | | | make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add cross_compile to qconfig.pri for global advertisingDonald Carr2012-03-081-0/+1
| | | | | | | | | | | | .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
* don't put QMAKE_ABSOLUTE_SOURCE_ROOT into .qmake.cacheOswald Buddenhagen2012-03-081-1/+0
| | | | | | | | | this is oxymoronic: if a .qmake.cache is present, telling qmake the project root is utterly pointless. the windows variant never had this. Change-Id: Iefc6e242ad7458dc699b955a3657f31f1ecf4c7b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove the fixed qt tool assignments from the configuresOswald Buddenhagen2012-03-081-3/+0
| | | | | | | | the tool locations are now determined with qtPrepareTool(), which takes non-installed qt builds into account already. Change-Id: I17b2c5f4b181417f2a612be2f540768e7dc0ae4e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove automatic building of moc from moc.prfOswald Buddenhagen2012-03-081-1/+0
| | | | | | | | the problem this (probably) tried to solve has been solved via ordered builds a *long* time ago. Change-Id: I84c58076c864735eea4210ec60aa060fe3e5d97e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Move qdoc into qtbase and bootstrap itLars Knoll2012-03-081-1/+1
| | | | | | | | | | | | | | | | 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>
* Query udev build parameters from pkg-configDonald Carr2012-03-071-1/+8
| | | | | | | | Change-Id: Ia3b7329d7359684ee7bf572a7e5fb681105108f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-92/+85
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
| * revamp -sysroot and -hostprefix handlingOswald Buddenhagen2012-03-011-38/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * make qlibraryinfo table-drivenOswald Buddenhagen2012-02-291-35/+30
| | | | | | | | | | | | | | | | | | | | | | | | switch blocks are noisy. this is nicer. reshuffled the LibraryLocation enum to make table lookups possible and future-safe. using pointer-free tables to avoid adding data relocations. Change-Id: I70ec2c2142ce02a15e67284e4b285d754d930da3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * remove bizarre padstring voodooOswald Buddenhagen2012-02-291-58/+29
| | | | | | | | | | | | | | | | | | evidently, The Author had no clue that the compiler will do that automatically. as it happens, the windows configure already did it right. Change-Id: I7ebc018c254b316205348874ffa527526329b630 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Remove Q_BYTE_ORDER and -*-endian arguments from configuresBradley T. Hughes2012-03-021-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead, we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only support a single endian format. For bi-endian processors, we set Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__, __BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test to do so). For operating systems that only support a single byte order, we can check for Q_OS_* in addition to the preprocessor macros above. This is possible because qprocessordetection.h is included by qglobal.h after Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE, which is always little- endian according to MSDN. Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Remove ARMFPA support and Q_DOUBLE_FORMAT detectionBradley T. Hughes2012-03-011-84/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the -armfpa option the config.tests/unix/doubleformat* detection. The places where we used QT_ARMFPA and Q_DOUBLE_FORMAT has been removed as well. Rationale: ARM FPA with GCC does not work with EABI. Qt currently does not support compiling without EABI, making ARM FPA an impossibility. It is unknown whether other compilers provide ARM FPA support with EABI. Support for ARM FPA can be re-added in the future should the need arise, but since ARM VFP is available for ARMv5 and up, we should encourage implementors to instead use soft-floats or VFP. Change-Id: I3671aba575118ae3e3e6d769759301c8f2f496f5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Remove Mac/QPA collision breaking library linkageDonald Carr2012-02-291-2/+0
| | | | | | | | | | | | | | | | Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Added helpful notice in configure about how to enable the xcb plugin.Samuel Rødal2012-02-291-0/+2
|/ | | | | | | This should make it less confusing for people building Qt 5 on Linux. Change-Id: I3aa7151f790587d5944c837d701b1b1b580b4bc3 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* configure: fixed qconfig.h symlink warningsRohan McGovern2012-02-281-3/+3
| | | | | | | | | | | | | | configure was unconditionally attempting to create two symlinks to qconfig.h: include/Qt/qconfig.h, and include/QtCore/qconfig.h. include/Qt doesn't exist any more, so this would always cause a "No such file or directory" warning. Remove that one. include/QtCore/qconfig.h is usually created by syncqt now, so this would cause a "File exists" warning. Make that one conditional. Change-Id: I8c6244dcbcf9765444f0d5c40c91a0ca192ecbcb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove stale QWS considerations from configureDonald Carr2012-02-281-520/+24
| | | | | | | | | | | Remove all reference to QWS/EMBEDDED in configure script Remove legacy qws config tests Change-Id: I09ed3d82bdda0fd0f9da87634d0cd1b7457a782b Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* process variable assignments with tabs as wellOswald Buddenhagen2012-02-251-1/+1
| | | | | Change-Id: If3caa4094aa9d8caefc9829bfea44426d59477d1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Correct pkg-config usage to respect sysrootDonald Carr2012-02-221-4/+4
| | | | | | | | | | | | | | | | | Direct use of pkg-config variables disregards the sysroot offset pkg-config factors into consideration with the dedicated variables: --cflags-only-I --libs-only-L these parameters exist exactly for this reason. Change-Id: Ieecf31ebe0640f64b272b84fba22701aacf8f966 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* revamp reading of bootstrap variablesOswald Buddenhagen2012-02-211-57/+84
| | | | | | | | make the "evaluator" able to process simple variable expansions. cache the processed spec, so it is not re-read for every variable. Change-Id: I20e69ec7b65faa7d571e68dbfea6c21c79a62641 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make sure that we pick up xcb from pkg-configJørgen Lind2012-02-201-4/+8
| | | | | | | | and run the configure checks with the values Change-Id: Ie8e0072c686c6a7dce1d02e25a9c1abce4679d34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove Native Client special casing from configure.Morten Johan Sorvig2012-02-201-61/+0
| | | | | Change-Id: I20f044b267b6c18e5a3050de22710c45e7573cc3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't force CFG_ENDIAN to "auto" on Mac.Morten Johan Sorvig2012-02-201-2/+0
| | | | | | | We no longer support universal ppc/x86 builds. Change-Id: I8c4a1d087d02da1ad80d91a7a04147b37e81d74f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't use -rpath-link when building on Mac.Morten Johan Sorvig2012-02-201-1/+1
| | | | | | | | | | The logic here was wrong: test if the target linker supports -rpath-link, and then set it for both host and target via mkspecs/qmodule.pri. Change-Id: Ie4da7ed2e06e784f9edb65a27290913ab838a8c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make configure ignore $CC and $CXXOswald Buddenhagen2012-02-181-8/+5
| | | | | | | | | this was inconsistent with how qmake itself works, and was actually wreaking havoc. Change-Id: I5aa83cc88ffe7141cc0c31b03b76c48274f1ebdb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Clean up default arch setting on Mac OS XBradley T. Hughes2012-02-171-15/+24
| | | | | | | | | | Remove config.tests/mac/defaultarch.test, but do the same type of default arch detection, only using the qmake binary instead of compiling an empty file. Qt 5 will only support 10.6 and up, which means we only support i386 and x86_64 now. Change-Id: I24949ac803b965c523b1ee45cf769e266dcde134 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove unused config.tests from config.tests/mac/*Bradley T. Hughes2012-02-171-2/+0
| | | | | | | | | | | | | The xarch.test and crc.test are not run by configure, so remove them along with the related CFG_MACH_XARCH and QT_NAMESPACE_MAC_CRC configure variables. The kEventClassQt variable in qt_mac_p.h is also unused now, so remove it as well. Change-Id: I596ab9b493ce3164b6a4d40e8942479efc91b60d Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Reduce PLATFORM_MAC usage in the configure scriptMorten Johan Sorvig2012-02-141-57/+28
| | | | | | | | | | | | All platforms are PLATFORM_QPA now, so we want to remove PLATFORM_MAC. Do one of two things: either remove the PLATFORM_MAC code path or test on BUILD_ON_MAC instead. Change-Id: I6037a1a5f79498d9e0b5c2607e3698319fc7f68f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Fix host endian detection when compiling with sysrootSimon Hausmann2012-02-141-1/+1
| | | | | | | | | | Apply the sysroot argument for the endian test only for the test used for detecting the target endianness, don't use --sysroot for the host detection. Change-Id: I53edda6ebfd06e73cc64f2561b707bd2ba052ae7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Force -fPIE on ELF if Qt is built with reduced relocationsOlivier Goffart2012-02-101-0/+5
| | | | | | | | | | | | | | | | Put in qconfig.h whether qt is compiled with reduced relocations. When using -Bsymbolic-functions (enabled by default on Qt) but not -fPIE, the comparison of the function pointers fail because the addresses are different in Qt, and in the executable. Hence we now enable -fPIE by default on qmake, and force a compilation error when it is not enabled and built with reduced relocations. Done-with: Sune Vuorela <sune@vuorela.dk> Change-Id: Ib3fdba06fab6e8a93b75b4c6cf16cc973ab335db Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Reorganize evdev pluginsLaszlo Agocs2012-02-081-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | linuxinput becomes evdevmouse. The experimental touch code is removed, now the plugin's purpose is solely to generate mouse events from absolute and relative pointer events. The plugin key is EvdevMouse. touchscreen becomes evdevtouch. The plugin key is EvdevTouch. In case keyboard support appears some day, it will fit nicely in the system by the name of evdevkeyboard or similar. Some little udev code is moved to platformsupport so it can be shared between the plugins. This may be extended later if more sophisticated udev support is needed. N.B. the intention is to keep this as simple as possible. We are shipping these plug-ins as reference examples, not as full-featured drivers. evdev and udev support has configure time tests from now on. This means the "drivers" (generic plugins) will get built automatically when the support is available. Change-Id: Iaf6260b5c2edfb9f25d070d2764466725adc6b4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* 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>