summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug in configure where Qt did not compile with QT_ICONV=noJan-Arve Saether2012-08-231-15/+5
| | | | | | | | | | | It did not compile because at the time qconfig.h was preprocessed, QT_NO_ICONV was already defined, causing the #define QT_NO_ICONV to fail. It should be guarded like most other defines in qconfig.h. Also fix QT_CUPS=no, QT_ICONV=no, QT_GLIB=no, QT_NOTIFY=no and QT_LARGEFILE_SUPPORT=64 the same way. Change-Id: Ic9e0295756c35cb7c62e18eb9b63b1410e7de051 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the QT_COMPILER_SUPPORTS_xxx defines to qconfig.hThiago Macieira2012-08-221-0/+21
| | | | | | | | | | | | | | | | This reduces dramatically the command-line for compiling Qt sources. These are private macros, only to be used by Qt's own modules, so the compiler setting is either the same or, possibly, better. In other words, in the worst case, when compiling a module with a better compiler than for qtbase, such module might not enable all the functionality it could otherwise do. If we switch to a buildsystem that can support this properly in the future, these macros should be removed. Change-Id: I71f2d12ec98c9dd40eaab9de4a17446bd1066020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make configure set up QMAKE_DEFAULT_{INC,LIB}DIRSOswald Buddenhagen2012-08-221-0/+5
| | | | | | | | | | | | | | hard-coding it in unix.conf was no particularly good idea for hopefully obvious reasons. the windows version is so far just a stub that does what the makespecs hard-coded - more doesn't seem worth the effort. the guys interested in x-building may want to rectify it at some point, but it's not going to be easy. Change-Id: I8fedd841a8416f8c0c57018752eae9510b5d00d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make it possible to pass configure zlib lib nameAndreas Holzammer2012-08-212-1/+5
| | | | | Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix freetype font rendering for Windows CEAndreas Holzammer2012-08-201-1/+0
| | | | | | | | | | Windows CE does not have support for GetGlyphOutline. So addGlyphToPath will not work. QML uses it for their distance field rendering. One option to bypass this issue is to use freetype as rendering backend. Change-Id: I965254344945cbdad771a5d505fb61c1cc2087df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QUrl is not necessary for configure.exe, drop it from the .proThiago Macieira2012-08-151-1/+0
| | | | | | | | | | | qurl.cpp was removed from the Makefiles on 6ab6b0fc1c594a589d96d17b5ab7, but I missed the .pro file. You're not supposed to use the .pro file anyway, it's just for opening in Creator. But if you forget to remove the qmake build step, it would get compiled. Change-Id: Ia52ae7349e195df58f76f8d2c5f8b46adfdc7454 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* support -rpath for modules which are not installed to QT_INSTALL_PREFIXOswald Buddenhagen2012-08-111-1/+1
| | | | | | | | | | | | | a module's project file may set MODULE_INSTALL_LIBS before loading qt_module.prf to have an alternative RPATH linked into the users of that module. this is relevant only for linking against non-installed -prefix builds of that module, as otherwise .libs from the module's pri file is used for rpath. Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make it possible to force generation of debug info in release buildsAndreas Holzammer2012-08-091-1/+15
| | | | | Change-Id: Ie79e5a6a87475d5140163a2a547b4385a53fc05f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename msvc11 to msvc2012Andreas Holzammer2012-08-073-6/+6
| | | | | | | | | Microsoft has named their new Visual Studio again after the old naming schema. Change-Id: Ib1b971807fa89d90b10892a2d78570058e564f3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Add possibility to add OpenSSL, DBUS, MySQL path under WindowsAndreas Holzammer2012-08-072-0/+16
| | | | | | | | | | | Under Windows it's quite possible that OpenSSL, DBUS or MySQL is not installed into a central place. If -I and -L is passed at configure time, it is added to all targets, and if that path contained a conflicting header things would go wrong. Change-Id: Ic3338c49aa6eaa91b3abf5341e709ef604bf7aab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce -fully-process configure option, change behavior of -processOswald Buddenhagen2012-08-061-8/+12
| | | | | | | | | | | configure will now run qmake without -recursive, as on modern systems one can get a lot more out of parallelization done by make, which qmake cannot do. use -fully-process to get back the old behavior. -dont-process is unchanged. Change-Id: I2874321a963175463ae8992f3ab2b01bc13c9922 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove phonon vestigesOswald Buddenhagen2012-08-061-44/+1
| | | | | Change-Id: Ifae2c631ddaae95ad9fc92e1f768fd910b254292 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove -dsp & -vcp vestigesOswald Buddenhagen2012-08-061-27/+1
| | | | | | | only -vcproj is meaningful at this point Change-Id: If727c96a9628e37a5a00a19a6eabede261c9c4b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove references to dead variablesOswald Buddenhagen2012-08-061-5/+0
| | | | | Change-Id: I2603ebabbec5011fa0bf3e858401655a9a822768 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove stray messageOswald Buddenhagen2012-08-061-4/+0
| | | | | | | | i think this was a vestige from the old wince build proces Change-Id: I13305de627c65fc1c93ba6d2383557ff5ea7a147 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove stale messages about using setcepathsOswald Buddenhagen2012-08-061-10/+2
| | | | | | | Change-Id: I9c0a61254aa50e57b18718aa44935007fd25bd74 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove the option summaries from the configures' help messagesOswald Buddenhagen2012-08-041-30/+1
| | | | | | | | | they are an unreadable and unmaintainable mess. the options are properly documented below. Change-Id: If2ec683fb7c3740b19798979f8a1f9cd8d84f457 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unused Q_WS_QPA define.Stephen Kelly2012-08-031-3/+0
| | | | | | Change-Id: Ie77526000cf93ad6901e28abe2558d254ccf8f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove some dead QWS code from configure.Stephen Kelly2012-08-031-35/+0
| | | | | Change-Id: Ic1b47533e3f04cebaac83ca632068c2e791a846c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adding configure option: -no-gcc-sysrootThomas Senyk2012-08-011-2/+7
| | | | | | | | | | | | | | | | | | This option is important if you want to use configure's and qmake's -sysroot (e.g. PKG_CONFIG settings, device-files), but the toolchain (in combination with the rootfs) is not able to handle gcc's --sysroot. One known case is freescale's ltib setup where the toolchain itself comes with all the essential files (e.g. crt1.o), while the rootfs has none of those files, so gcc's --sysroot can't be used. The rootfs on the other hand contains all kinds of "less important" files/packages (e.g. libdbus). For those "less important" files/packages Qt needs pkg-config to be able to include/link properly. Therefore one needs configures -sysroot without gcc's --sysroot. Change-Id: Iaec9b07012f2945f3ecb3ced0ed95176721b5ecd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add configure options for debug/release OpenSSLPeter K├╝mmel2012-07-312-7/+30
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Change-Id: Ic27ede2d9531b94aff4c50c1699947ce72caf286 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make 'nmake qmake' work with the stub (fast) MakefilesThiago Macieira2012-07-281-1/+2
| | | | | | | | | Without this, if you ran 'nmake qmake' or 'jom qmake' in qtbase's top directory, it would simply tell you that 'qmake' was up to date. After all, there is a directory called 'qmake' there. Change-Id: I6cdb405e8106c137ecbab27923e524b924b19c84 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix copypasto: iconv -> cups.Stephen Kelly2012-07-251-1/+1
| | | | | | | Introduced in eba0efe10ea90dec7a8b1e95017b0203b899af95 Change-Id: I6bfbf884f66057955d62db6266cf11b399edf965 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable CUPS auto detection on WindowsRafael Roquetto2012-07-191-0/+8
| | | | | | | | | Detect CUPS availability automatically when cross-compiling from a Windows host. Change-Id: Ife9bb90732c39794a7b760ced4aaea232612fe54 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improve Windows XP and Vista styles auto detectionRafael Roquetto2012-07-191-1/+1
| | | | | | | | Do not build windows styles when the target platform is not Windows. This makes a difference when cross-compiling. Change-Id: I2184d39ed253af1069c5cdcd6a848611cff24789 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Auto detect iconv on Windows hostsRafael Roquetto2012-07-181-0/+7
| | | | | | | | Enable auto detection for iconv when cross-compiling from Windows hosts. Change-Id: I699e0a31d938403f5e80e74be90df87f11f361ba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix auto detection in configure.exeRafael Roquetto2012-07-181-5/+9
| | | | | | | | | All auto detection tests were failing because the default mkspec was not yet installed during the time they were run. Change-Id: Iad14580f38d1539d9831917e5c9c707eae4c0c90 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-171-4/+10
| | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. Change-Id: I24edd589ce7baf2614480a91842ca756ead39463 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure{.exe}: enable 'tools' as a default build partRohan McGovern2012-07-101-1/+1
| | | | | | | | | | | Tools for each module should be enabled by default. Prior to qt_parts.prf, they have been enabled by default, but only by accident - the value of QT_BUILD_PARTS with respect to 'tools' was generally not respected. Change-Id: Icd49d6128d4050ff1c865967a563e9ab88c5a3a2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* removed unecessary ce override of QT_INSTALL_PREFIXBjoern Breitmeyer2012-07-091-3/+0
| | | | | | | | this stopped the installation of mkspecs for windows ce Change-Id: Ic57337904b88e4460f9f4110b08ecefb1a2eed8b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make QT_BUILD_PARTS setting in qmodule.pri additiveOswald Buddenhagen2012-07-091-1/+1
| | | | | | | | that way it is actually possible to add additional parts from the qmake command line. Change-Id: I42e0b58424292cebafb57538a879204d370397bb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* export QMAKESPEC to the projectOswald Buddenhagen2012-07-031-13/+0
| | | | | | | | | | this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't match on the spec name in qconfig.priOswald Buddenhagen2012-07-031-2/+1
| | | | | | | | | | | | this will fail now even on unix (and wouldn't have ever worked on windows), as the full spec name is known only after reading the spec, and qconfig.pri is read from inside the spec. matching on the host_build flag is cleaner anyway. Change-Id: I7da144e89ab3db0fad942d755d8cb0a0f3b85588 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Donald Carr <sirspudd@gmail.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* buildsystem: Remove SXE from the configure and qconfig-*.h filesHolger Hans Peter Freyther2012-07-021-4/+0
| | | | | | | The SXE feature was used with Qtopia but is long gone. Clean it up. Change-Id: I55fba97b6382300ba63e94f3a6c415227f571e37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'buildsystem' (second round)Oswald Buddenhagen2012-06-293-59/+18
|\ | | | | | | | | | | | | | | | | refactoring and cleanup. fixes x-builds between different os families. Conflicts: mkspecs/features/qt.prf Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91
| * don't copy files to default specs any moreOswald Buddenhagen2012-06-273-59/+18
| | | | | | | | | | | | | | | | now that the default specs really only forward to the real specs, it is not necessary to copy any auxiliary files. Change-Id: I169a61a045063b796062fe6af3a2afbe3f1c9da0 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Fix configure.exe to build qmake before testsRafael Roquetto2012-06-283-97/+103
| | | | | | | | | | | | | | | | | | | | qmake is needed by autoDetection()/tryCompileProject() to be able to build the tests. This patch also add a new method - generateQConfigCpp() - which generates qconfig.cpp, needed to build qmake. Change-Id: Ic304a364a13a2b3c28433f2a299df222a56fed67 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Clean up the use of QT_NODLLThiago Macieira2012-06-283-3/+3
| | | | | | | | | | | | | | | | | | | | 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>
* | Update the macros for shared/DLL and static buildsThiago Macieira2012-06-281-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, we had a mess of different macros used for building DLLs, for building shared libraries on Unix systems and for building static libraries. Some of the macros were contradictory and did not work. From now on, there shall be only: - QT_STATIC: indicates that it's a static Qt build and the export macros should expand to empty - QT_SHARED: indicates that it's a shared / dynamic Qt build and the export macros should expand to Q_DECL_EXPORT or Q_DECL_IMPORT, depending on whether the macro corresponds to the current module being built (the QT_BUILD_XXXX_LIB macro comes from the module's .pro file) QT_BOOTSTRAPPED implies QT_STATIC since the bootstrapped tools link statically to some source code. QT_STATIC is recorded in qconfig.h by configure when Qt is configured for static builds. Nothing is recorded for a shared / dynamic build, so QT_SHARED is implied if nothing is defined. This allows for the existence of a static_and_shared build: with nothing recorded, defining QT_STATIC before qglobal.h causes the export macros to be that of the static form. Linking to the static libraries is out of the scope of this change (something for the buildsystem and linker to figure out). From this commit on, the proper way of declaring the export macros for a module called QtFoo is: #ifndef QT_STATIC # ifdef QT_BUILD_FOO_LIB # define Q_FOO_EXPORT Q_DECL_EXPORT # else # define Q_FOO_EXPORT Q_DECL_IMPORT # endif #else # define Q_FOO_EXPORT #endif The type of the Qt build is recorded in QT_CONFIG (in qconfig.pri) so all Qt modules build by default the same type of library. The keywords are "static" and "shared", used in both QT_CONFIG and CONFIG. The previous keyword of "staticlib" is deprecated and should not be used. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-April/003172.html Change-Id: I127896607794795b681c98d08467efd8af49bcf3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | disabling largefile support for Win CEBjoern Breitmeyer2012-06-281-0/+1
|/ | | | | | | | | | this was disabled before but I2631ff687881278ba42edacd237a2130c103b69f enabled it per default Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Workaround to compile configureapp.cpp with MSVC2010 x64jian liang2012-06-271-1/+1
| | | | | | | | | Remove a non-ascii character from configureapp.cpp to let it to be compiled successfully with MSVC2010 x64. Change-Id: I0b016630be49e8731cc438abca4ef959124138be Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't compile the host tools for wince already in configureOswald Buddenhagen2012-06-273-68/+0
| | | | | | | | qmake can now produce proper mixed-target projects Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Avoid macro re-definition after 1838a6c2fb5e3b4368c871aa330d028b255b83afKonstantin Ritt2012-06-261-1/+1
| | | | | | Change-Id: I2631ff687881278ba42edacd237a2130c103b69f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* New command line switches for configure.exeRafael Roquetto2012-06-211-7/+158
| | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* purge QMAKE_INCDIR_QT and QMAKE_LIBDIR_QTOswald Buddenhagen2012-06-191-5/+0
| | | | | | | they are equivalent to QT_INSTALL_(HEADERS|LIBS)/get. Change-Id: Ic4b47f3ca7db55785b96f19020a2fa020a8d25bd Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce /get property variantsOswald Buddenhagen2012-06-191-0/+11
| | | | | | | | | | | | | | | properties are now split into a write location $$[FOO] and a read location $$[FOO/get]. the write locations are hard-coded and configurable via qt.conf/Paths as before, while the read locations are configured via qt.conf/EffectivePaths. this finally provides a clean solution to the problem that during the qt build itself tools and libraries need to be taken from somewhere else than they are installed to. Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* don't overquote make commandOswald Buddenhagen2012-06-191-1/+1
| | | | | | $(MAKE) is apparently already quoted when the path contains spaces Change-Id: Ie09a0f43083f9eae95fc135c3a74364eaa356934
* clean up path normalization in configure.exe and QLibraryInfoOswald Buddenhagen2012-06-192-105/+109
| | | | | | | | | always use normalized path separators, except when running native commands or printing (note however that the qmake -query output will now be consistently normalized). Change-Id: I6ae920c3bc656cb517d1f4e4e5518cf79e002169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* properly declare the host tools as such in the project filesOswald Buddenhagen2012-06-191-3/+0
| | | | | | | don't mess with the qmake cmdline args any more. Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce ability to build projects for the host systemOswald Buddenhagen2012-06-191-5/+11
| | | | | | | | | | | | | | | | | when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>