summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-012-0/+33
| | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5 Original-patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove CDE and Motif styles from qtbaseJens Bache-Wiig2012-09-271-29/+0
| | | | | | | | | | | | | | | | | It is time to clean up some of our legacy code. These styles have not been actively maintained for a long time and I think it is safe to say that they should no longer belong as part of the default distribution of Qt. We dont support any platforms based on CDE with our source packages. Note that even if we are removing these styles from the default distribution of Qt, applications that depend on them will still be able to bundle the existing (and unmodified) styles along with their own source code as we are not breaking compatibility. Change-Id: I1709630c20ba8e8088cd01628628d86856db57a4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Check in arch detection for qmake failuresAndreas Holzammer2012-09-271-2/+8
| | | | | | | | | QMake can fail at arch detection, so remove the silence here and fail when qmake does not produce any Makefile. Change-Id: I8826867952665a68f7205acf99ee6f1c9ead8513 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Configure.exe: Fix auto-detection of ICU for MinGWKai Koehne2012-09-271-1/+2
| | | | | | | | | | If one compiles ICU with MinGW the .lib files also have a lib prefix. Take this into account when checking for ICU availability. Upstream bug report: http://bugs.icu-project.org/trac/ticket/9603 Change-Id: Ia1ca49053b0ab41de45eec13799d94d5e934c42e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* configure.exe: Don't print warning about -c++11 option by defaultKai Koehne2012-09-271-0/+5
| | | | | | | | | Make sure that defaultTo() and therefore autoDetect() actually keep the "auto" setting for MSVC. We check for this later on in verifyConfiguration. Change-Id: Iebf1ef415161a09bbc871baa31ff9dc56d54acac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Introduce an option to disable stripping during installationThiago Macieira2012-09-241-1/+12
| | | | | | | | | | The default is the current behaviour: strip on installing release, no strip on installing debug. This option does not change the installation of debug builds because qmake does not support that. Change-Id: Ic208d5ffe860d5f1ee1cafdc944e12001673d33f Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use QStringList::join(QChar) overload where applicable [tools]Marc Mutz2012-09-231-12/+12
| | | | | | | | | | This is an automated change performing the following replacements: join\("(.)"\) -> join('\1') join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1')) join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1')) Change-Id: Ia087beb886bbaec1a0976cd924440d8904044879 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* configure: Update contact information for commercial usersSergio Ahumada2012-09-221-1/+1
| | | | | | | | Task-number: QTBUG-23949 Change-Id: Iaca7f45eae39ab7f6368431daead93358b17fe36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sinan Tanilkan <sinan.tanilkan@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2210-242/+242
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* don't require a fake qconfig.h for the configure bootstrapOswald Buddenhagen2012-09-193-3/+3
| | | | | Change-Id: I3d1224ad19b9e5278e35cf7c5142a29ccb589140 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* syncqt only the QtCore headers for the bootstrapOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: I26e19805823bfe987c721f6a274803e54f0e4003 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* simplify forwarding include() statement in default specsOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: Ie584491a5f0355ef3f4457d9b4b9734e6e8fdc47 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* configure.exe: Improve help outputKai Koehne2012-09-191-75/+75
| | | | | | | | | Add line breaks where it's looking awkward in cmd.exe , and new lines where needed. Also adapt some descriptions to the configure shell script output. Change-Id: Ie784e715f51f7ff692ee85f7c960dc4583b65b23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix configure.exe outputKai Koehne2012-09-191-1/+1
| | | | | | | Fix help output for -no-fontconfig, introduced in commit 1838a6c2. Change-Id: I686000d51c56fde56179dcebef31b0783c0dfc29 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add c++11 option to configure.exeKai Koehne2012-09-131-1/+30
| | | | | | | | | | Also check for c++11 support in configure.exe (which is also used by MinGW builds). The c++11 check is therefore moved from 'unix' to 'common' directory. Change-Id: I082848f032c2770e52e34f331b83820f395c06b6 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* call syncqt before building qmakeOswald Buddenhagen2012-09-112-2/+7
| | | | | | | | | | otherwise non-developer builds (which don't have it run by the configure bootstrap) don't work. Change-Id: Ide49c0d1646b22687d16366530b246c3754926eb Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove setcepaths.batOswald Buddenhagen2012-09-111-3/+0
| | | | | | | | we don't need it any more, as the makefiles are self-contained now. Change-Id: I1a560a8331856e246e03c55ec1b1dd1a5cb112e4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qtmodule-configtests is no more, so don't shadow itOswald Buddenhagen2012-09-111-7/+0
| | | | | Change-Id: I0cb51cb63feb09f188764ace7d7b817ca10dd169 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce -minimal mode to syncqt and use it for bootstrappingOswald Buddenhagen2012-09-111-0/+1
| | | | | | | | | | the bootstrap does not need CamelCase includes, deprecated headers and whatnot, so just don't do it. the full thing will be run on qtbase by qmake. Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* compile without CamelCase headersOswald Buddenhagen2012-09-114-13/+14
| | | | | | | | for faster bootstrapping without a full syncqt run Change-Id: I648f0a8fb09be021590c46e8e5e15667a316c817 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* clean up syncqt invocationOswald Buddenhagen2012-09-111-4/+1
| | | | | | | it needs no special env variables any more Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Removing duplicate includesSergio Ahumada2012-09-091-1/+0
| | | | | | | Do not include a header more than once Change-Id: Ia2e5d66e72988ad833cf5177a3f8aa988bf510e9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* enable depend_includepath by defaultOswald Buddenhagen2012-09-081-1/+1
| | | | | | | | | | | | DEPENDPATH is hard to get right, and consequently most projects have broken dependencies. the easy way out is just adding everying in INCLUDEPATH to DEPENDPATH, like we do ourselves in qt. if somebody wants to optimize, he can opt-out. Change-Id: I7fb56010728fd2b0d2b7d4d26386f366d414ba04 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* configure: Unify order of options in helpKai Koehne2012-09-071-2/+2
| | | | | | | | | The -developer-build option in the configure shell script is right after -force-debug-info, move it to the same place in the Windows version. Change-Id: I9b944f8591011ce9987a4fb98f7d02d88160d9e8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: Fix infinite loop displaying config.summaryJonathan Liu2012-09-031-1/+1
| | | | | | | | | Displaying config.summary sometimes results in an infinite loop because the loop condition only checks that failbit and badbit are not set. The eofbit may be set with failbit and badbit not set. Change-Id: I209480fbf114365fd4fdf1289c988a386f9f2562 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 04:18:41 +0000