summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-11-081-0/+32
| | | | | | | | | Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493 Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* x-compile with mingw: fix codec linker errorsPeter Kümmel2012-11-031-0/+5
| | | | | | | | | | | | Don't build codecs into Core when plugins are used. Qt5 doesn't use plugins for the codecs any more and they are part of Core. This change was considered too drastic for Qt 4.8, so no backport is possible. Task-number: QTBUG-27618 Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-11-011-0/+21
| | | | | | | | | | | | This option is opt-in (default: no). When configured with "-system-proxies", Qt automatically picks up the system proxies. (backport of commit f7893223e84db86dcdd860c625663d7006fcdad6) Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* configure: state compiler explicitly when testing for supported flagsPeter Hartmann2012-10-211-7/+8
| | | | | | | | | | ... so we can test those functions with host and cross compilers. Additionally, make sure we check the host compiler for QMAKE_LFLAGS. (backport of commit 1da978416d89b86d92087e8dc51bdb305b6ed58c) Change-Id: Id3f5f55e3a9e6b3d0dc72f96aa136f64390d08a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-141-2/+18
| | | | | | | | | | | | | | | | | | | | | 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. Original-patch-by: Greg Bentz (cherry picked from commit 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f) Change-Id: I5867fc03dde1ef6e2fbf3747bdb9aaf15518eb6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: change suffix for separate debug filesPeter Hartmann2012-10-021-1/+1
| | | | | | | | | | | QNX uses .sym for files containing debug symbols. Patch-by: Greg Bentz (cherry picked from commit 291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f) Change-Id: I03202da79de0f606c7c99a2db986d2343e51663d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Pass --sysroot to endian.test when testing the target endiannessRomain Pokrzywka2012-09-301-1/+1
| | | | | | Change-Id: Ib7b68401e683b20dea42b7cf597784a13a995984 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-26/+26
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* configure: mac features don't belong on cross mingw targetMark Brand2012-09-211-0/+5
| | | | | | | | | | | | | | CFG_MAC_DWARF2 and CFG_MAC_XARCH options are for targetting macs, not bulding on them. qt5/qtbase commit 7a67c822e3e552d0d881f0409a5316de07dbb8c7 removed CFG_MAC_DWARF2. qt5/qtbase commit 59d5c26075724a581ed276d62d884b44d2ca4489 removed CFG_MAC_XARCH. Change-Id: Idb789ed9a8aa9b824a4c2191a9c39e741ca49574 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use qmake to get PKG_CONFIG in configure scriptMark Brand2012-09-191-2/+6
| | | | | | | | | | | | | | | The value of PKG_CONFIG might depend on device options. For example, "-device-option PKG_CONFIG" might be used with configure or a mkspec might prefix PKG_CONFIG with CROSS_COMPILE which is specified as a device option. The shell functions of configure for parsing mkspecs do not take device options into account, but qmake is pretty good at it now. backport of qt5/qtbase 01864d4854557d2cf8b067e229d77cd7c9c553ee Change-Id: I1c9558e550c48e8441ebdac34b82066473c2ce3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: postpone pkg-config detection until after qmake is builtMark Brand2012-09-191-55/+55
| | | | | | | | | | | pkg-config isn't used before qmake is built, so these tests can take place afterward. This is preparation for using qmake to resolve PKG_CONFIG in mkspecs. Change-Id: Icedf9ebd80bbac3fe1e5d7eeca358cb0fc9de072 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-181-6/+0
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* unscramble option help textMark Brand2012-09-141-3/+2
| | | | | | | cherry-picked from qt5/qtbase commit 5c412fd74c9164f1e73a7287ca603295ce73bcf5 Change-Id: Ib55b63d82823a348857b0f76e99b184eb475ef44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Partial Revert "Disable pkg-config, when x-compiling for mingw"Mark Brand2012-09-121-1/+0
| | | | | | | | | | | | | | | | This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271. Despite what the commit message said, pkg-config previously worked and was useful, particularly for static Qt. Qt itself even installs its own .pc files. Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid using the pkg-config installation on the build machine. cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable rpath, pkg-config, "reduce export" flag when x-compiling for mingwPeter Kümmel2012-09-071-1/+7
| | | | | | | | | | This patch disables rpath and pkg-config because both are not supported by Windows. The reduce export flag produces linker errors when Dlls are used. Partial cherry pick from qtbase/07a978d3d4b41739eff1061dc45dbfa737bf78b9 Change-Id: Iee679373397a2f97780876471a138c7bcddd2c7b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add cross_compile to qconfig.pri for global advertisingPeter Kümmel2012-09-071-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. Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Minimal backport of --device-option support in configurePeter Kümmel2012-09-071-1/+39
| | | | | | | | | | This parial backport only adds the --device-option so it becomes possible to set and cache additional qmake variables. Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676 Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add default QPA plugin option to 'configure'Ian Dean2012-08-131-1/+14
| | | | | | | | | | | | | Add option to specify default QPA plugin with -qpa command-line option for 'configure'. This matches the option used for configuring the default platform plugin for Qt5, and is optional (if omitted, no default platform plugin will be set up). This change is back-ported from Qt5 (Change-Id: 0074cc5d) Change-Id: Iec6e29ab14f19dcdde50ca1baa02b61b3ef66979 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Don't build qtscript when stdint.h isn't availableKent Hansen2012-08-101-1/+2
| | | | | Change-Id: Iba283c8642b2738e1b333e6734eec4369ce8bac4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't build qtscript when stl isn't availableKent Hansen2012-08-101-1/+7
| | | | | | | Task-number: QTBUG-7813 Change-Id: Ie0873e7fbd1168b11e5881d156a0583d0fa7f859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. 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: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Adding cflag -c to configure's --sysroot test.Thomas Senyk2012-07-201-1/+1
| | | | | | | | | | This forces compiler-only (avoid linker). Otherwise fails if linker needs more options. This happens for trimslice using codesourcery toolchain. Change-Id: Iea509bf0f53b888505a5ac0fe15b5705712a2fce Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix typo in configure for Mac: Libraries -> LibrarySergio Ahumada2012-07-191-1/+1
| | | | | | | Task-number: QTBUG-18115 Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit bf3b08ee0644c848a82067d2ad38d1bdc2ec7108)
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-181-0/+3
| | | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix auto-detected QNX mkspec paths in configureSamuli Piippo2012-05-031-2/+2
| | | | | | | | Removing 'unsupported' from QNX mkspec paths in configure when it auto detects missing platform and xplatform arguments. Change-Id: Icc180a0c1cb226865e3f416ae50eec16523114b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure: Escape '{' in getQMakeConf2 functionSergio Ahumada2012-05-021-1/+1
| | | | | | Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 62185f07f8ac1515b9e884452b33978c5a521549)
* revamp reading of bootstrap variablesOswald Buddenhagen2012-03-261-57/+84
| | | | | | | | | | | make the "evaluator" able to process simple variable expansions. cache the processed spec, so it is not re-read for every variable. (cherry picked from qtbase commit 3cf6521f54175031382672c3331899fe1f98a6c9) (cherry picked from qtbase commit f5a03eec2d0f12917572bfa9cb48b4145768480a) Change-Id: I20e69ec7b65faa7d571e68dbfea6c21c79a62641 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Handle -sysroot option in configure scriptGareth Stockwell2012-03-151-1/+1
| | | | | | | | | Although the code for processing a sysroot was already present, the -sysroot command-line option was ignored. Change-Id: Idde473d4b5f9cf3d56b508c71614d4cbc0248492 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-061-0/+2
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add support for QNX iconv implementation.Rafael 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. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-171-4/+0
| | | | | | | | | | the change is bogus; people were actually building it successfully. This reverts commit 0c70be512bfc40e8a2a09f60a66b7ecb114e748e Change-Id: I641fac34b78d6c23ead143d34a8ae15bf191cae3 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix for coreservices, it should be part of QPA testsAndy Shaw2012-01-171-5/+7
| | | | | | | | | Since the coreservices test should be part of the QPA ones after all, this reverts d317182e and fixes the original problem correctly by checking if qpa is on before testing for coreservices Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qnetworkproxy_mac.cpp was not compiled in on Mac for the network moduleAndy Shaw2011-12-211-7/+5
| | | | | | | | | | | The problem is that the coreservices configuration was not turned on due to the fact that the configure test was never ran. This is because the configure test was placed in the wrong platform section and would actually be ran for QPA and not Mac. Task-number: QTBUG-23302 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Symbian-linux crosscompilation configuration alignPasi Pentikainen2011-11-291-2/+3
| | | | | | | Change the configure-sh on Symbian linux crosscompilation to set rtti. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14361
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-181-53/+75
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Minor improvements to whatlog generation in Symbian tools2 builds. Fix linux-symbian cross-compilation configure-phase for platform builing
| * Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-141-53/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Symbian platform itself, the lower layer libraries are not available on configure phase, and the config.test build scripts fail, creating false "NO"-flags (also config.test currently does not work with Symbian raptor). This fix aligns the configure results of configure-sh- script with configure.exe as far as possible and fixes couple of symbian cross-compilation configure issues, as detailed below: Configure sh-script: - Disable configure tests with symbian-sbsv2 where the failing test would result to invalid disable-flags - Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that are not produced by configure.exe either - Fix emitting of "QT_NO_GUI" flag (in all environments) qtconfigure.flm: - Copy mkspecs as files to /epoc32/... instead of symbolic link Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* | Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.Rolland Dudemaine2011-11-151-7/+54
|/ | | | | | | | | | | | Defaults are set for QT_INSTALL paths, and for various CFG_ defines. Also set the input and framebuffer drivers to be used. Also set the BUILD_PARTS to the reduced set that produce target code. If using script and declarative, then these are added still. Make the configuration explicitly "Qt for INTEGRITY". Since *_DIR variables are set in the first part of the configuration, do not set them again in the generic code. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-311-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash when destroying the shortcuts Disable activeqt on win32-g++ (it doesn't build). fix warning remove unused functions Make the DBus timeout configurable in QDBusAbstractInterface. Fix a typo in qt-conf docs. Revert "Fix build with the Clang compiler" Added missing no_include_pwd check Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)' Fix build with the Clang compiler Change spacing of title in offline style. Add support for rawFonts loaded from data in FaceId examples: fix compilation with namespaced Qt. Russian translation update Update Japanese translations for Qt 4.8. directfb: Include directfbgl.h directly tests: fix QNetworkProxyFactory test don't detach until the list is going to be modified optimize QList::removeAll()
| * Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-0/+4
| | | | | | | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-261-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.
* Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-231-0/+13
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| | * add a configure-time check for an IPC supportRitt Konstantin2011-06-211-0/+13
| | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-221-3/+3
|\| |
| * | Adding arm armv6 and armv7 as valid archs for mac buildsIan2011-06-201-2/+2
| |/ | | | | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix for QTBUG-18947. Changed the macosx deployment target to 10.5Simo Fält2011-06-071-1/+1
| | | | | | | | Reviewed by: Eckhart Köppen
* | Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-301-1/+1
|/ | | | Reviewed-by: Andreas Kling
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-161-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 08:28:03 +0000