summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
...
| * purge buildkey-related dead codeOswald Buddenhagen2013-05-223-49/+0
| | | | | | | | | | Change-Id: I196dbe33b349d437450a5ea68befb3d6bfe1b574 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * purge obsolete EVAL #ifdefsOswald Buddenhagen2013-05-223-50/+1
| | | | | | | | | | | | | | clearly, nobody's been maintaining them for an extended period of time. Change-Id: I41c6b40026f107d34f7964934f36bc727fb6b795 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * get rid of syncqt wrapper scriptsOswald Buddenhagen2013-05-131-21/+3
| | | | | | | | | | | | | | | | | | | | | | instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * install host libraries into -hostprefixOswald Buddenhagen2013-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and introduce -hostlibdir configure option for symmetry. the libraries built for the host have no business in the target prefix. in principle this code would even support dynamically linked host libraries, but that's currently unused. Task-number: QTBUG-30591 Change-Id: I8e600fa4911a020fb0e87fbf7ef2f35647c7c4d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Ivan Romanov <drizt@land.ru>
| * Improve support for <MODULE>_PATH optionsMatt Fischer2013-05-101-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several modules, including DBus, MySQL, and OpenSSL have configure options of the form <MODULE>_PATH, which is used on Windows (where pkg-config is not present) to specify the locations of third-party libraries. These switches had been implemented by adding extra variables which were referenced in .pro files, to add the appropriate compiler and linker switches. This is undesirable because it means there are two independent paths for adding the switches to the build, which can get out of sync with each other, and indeed this had happened for some of the DBus tools. To remedy the situation, all three of the switches were reworked so that they added values directly to the principal variables that are used in the project files. This reduces maintenance, by ensuring that the pkg-config and non-pkg-config paths appear the same to the rest of the build system. Change-Id: Iae342f1d14b79fbcfef9fe38aadc803ad3141799 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Add -eventfd flag support to configure.exeRafael Roquetto2013-05-091-0/+18
| | | | | | | | | | | | | | | | | | | | The lack of eventfd(7) switches and auto detection caused cross-compilations to fail on Windows hosts, for builds targeting POSIX systems which do not support eventfd(7), such as QNX and BB10. Change-Id: Ic8f53c64066ece6f16d4dbc79c089b058401e632 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-291-0/+12
|\| | | | | | | Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
| * Configure: Provide -no-gui option for Windows host builds.Stanislav Ionascu2013-04-221-0/+12
| | | | | | | | | | Change-Id: I5f1fd9c39db31410c6e17f3e0dd90a27d35428ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-221-1/+1
|\| | | | | | | Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
| * Fix incorrect compiler-from-mkspec selection in configureAndrew Knight2013-04-151-1/+1
| | | | | | | | | | | | | | Semantic error in selection for MSVC 2010. Change-Id: I9ad97784cdb1a060df41bd1bb4e6c9f43adb387c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Make QT_CPU_FEATURES a map of features based on architectureTor Arne Vestbø2013-04-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | For now there's only one architecture per host/target, but this will change once we start detecting the CPU features for both device and simulator on iOS. For convenience we set QT_CPU_FEATURES to the resolved value of the current architecture, so that simd.prf still can use QT_CPU_FEATURES directly. Change-Id: I28e8b339a5c30a630e276165254dba09a3da6940 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Move QT_CPU_FEATURES from qconfig.pri to qmodule.priTor Arne Vestbø2013-04-111-2/+6
| | | | | | | | | | | | | | | | | | QT_CPU_FEATURES is internal and only used by simd.prf, which is also internal. This matches the available CPU features which are detected using config tests and written to CONFIG in qmodule.pri. Change-Id: I8eb35448e2954a54c228d3617f29afc0283a7db5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-04-101-5/+12
|\|
| * Upgrade ANGLE to DX11 ProtoAndrew Knight2013-04-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrades ANGLE to dx11proto (dx11-MRT-support tag), which splits out support for DirectX9 & DirectX11. The DX9 codepath is used by default; CONFIG+=angle_d3d11 must be passed to the ANGLE project to build for DX11. Existing patches to ANGLE have been updated (or removed if no longer needed), and a patch has been added to make DX9/DX11 codepaths mutually exclusive. Change-Id: Ibe13befadb94f04883eca449d0ee1f0da955ff92 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Axel Waggershauser <awagger@gmail.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-2/+2
| |\ | | | | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | * make the libexec default on windows bin/ after allOswald Buddenhagen2013-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them). in fact, the libdir should be entirely irrelevant for windows deployments (and indeed, the SDK is delivered with dlls only in bin/). Change-Id: If47e72b24774721a61ba63847f6132f88ff110be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Only set QMAKE_DEFAULT_LIB/INCDIRS for target buildsTor Arne Vestbø2013-04-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The default lib and include dirs are resolved using the target compiler and with a sysroot, so they are not relevant for host builds. Change-Id: Iceb2eb865d0732b9a6f5896ad126200ae8e8a04e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Don't use custom namespace for QT_HOST_ARCH/CPUFEATURESTor Arne Vestbø2013-04-101-4/+7
|/ / | | | | | | | | | | | | | | | | We now have host_build to distinguish the two, and we load qconfig.pri from both the host and the target mkspec, with host_build set correctly. Change-Id: I8b8b80d5487d10bb1d4585d27d10300f609a7775 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Enable configuring via configureapp for Windows.Ray Donnelly2013-04-031-2/+86
| | | | | | | | | | | | Change-Id: If8f27f54d4d79c3530f51edafe7f8f42d685bc47 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Add some more qconfigs to configureapp.Ray Donnelly2013-03-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | REDUCE_EXPORTS -> QT_VISIBILITY_AVAILABLE REDUCE_RELOCATIONS -> QT_REDUCE_RELOCATIONS !QT_GETIFADDRS -> QT_NO_GETIFADDRS These will be used for Android build on Windows. Change-Id: I2cde989e41dc5b7f9bef1345e935cc7e19aba983 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-211-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * pass module version to syncqtOswald Buddenhagen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is cleaner than having it parse qmake project files. the only remaining built-in version extraction is the fallback to qglobal.h needed for bootstrapping. as a "side effect", this fixes the build of modules with mismatched versions centralized in .qmake.conf, as this was simply not handled so far. the -mkspecsdir syncqt option goes away, as there is no use case for it any more. Task-number: QTBUG-29838 Change-Id: I6912a38f0e93a26bc267a9e3d738506fd3ad431b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * add/unify progress messages to/from the configuresOswald Buddenhagen2013-03-151-0/+2
| | | | | | | | | | | | | | | | it's weird that the output from the two variants is differing, and that after building qmake it appears to hang. Change-Id: I2ac3ace11e958effe787b13e1300eb1d2839ae98 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Fix static builds with ICUKai Koehne2013-03-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we actually link against the static version of the ICU libs for static builds. Task-number: QTBUG-29478 Change-Id: Ida7b439f11c5393bee43bfe804f9ec84bf272b34 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-053-3/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
| * | Make -force-debug-info option workPaul Olav Tvete2013-02-271-1/+1
| |/ | | | | | | | | | | | | | | | | Should be applied to Qt modules. Not interesting for third party users. Change-Id: I8fce821af397e3ace011a426c762319f6d30004f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * add -skip option to the configuresOswald Buddenhagen2013-02-203-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it possible to exclude modules from the build without moving their sources out of the way. substitutes the much-requested -no-webkit. not adding a symmetrical option, as it is relatively pointless: to build only specific "leaf" modules, you only need to run "make module-qt<module> ..." once you configured. and removing particular "intermediate" modules is achieved with this very option. Task-number: QTBUG-26697 Change-Id: I25cebdbd029885a2c653c4cde696f9bb78691768 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix libexec configure.exe status lineOswald Buddenhagen2013-02-201-1/+1
| | | | | | | | | | Change-Id: I22b4c07a3d39ab2f3288d0872a0ccaff45b0c153 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add the infrastructure to compile Qt with -WerrorThiago Macieira2013-02-281-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | This is enabled only for -developer-builds and only for certain compiler-version combinations that are in a whitelist. It also requires each library, plugin or tool to declare whether it is supposedly clean of warnings. When most targets are clean, we can consider inverting. Change-Id: I17b5c4e45aee5078f9788e846a45d619c144095a Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-201-0/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
| * add QT_CONFIG's static/shared to CONFIG on startupOswald Buddenhagen2013-02-181-0/+1
| | | | | | | | | | | | | | | | | | ... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Unify win32-g++ and Unix qmake Makefiles.Ray Donnelly2013-02-191-5/+57
|/ | | | | | | | | Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Place libexec binaries into lib folder on WindowsKai Koehne2013-02-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default libexec directory to 'lib' on Windows for default configurations. This makes sure that e.g. qtwebprocess can actually find & load the right Qt libs. A separate libexec directory was introduced to avoid conflicts between a system-wide Qt in PATH and a custom Qt installation. However, since there are no system wide Qt installations on Windows this isn't an issue, but getting the executables to find its Qt libraries is. Alternatively we could have also placed it in the 'bin' directory. However, putting it in the 'lib' folder carries the notion that, unlike the binaries in the bin, the libexec executables might have to be deployed with a target application. The exception is when a separate archdata prefix is specified, and $$archdata/lib won't contain Qt libraries. In this case we use libexec like on the other platforms too. ChangeLog: [Qt for Windows] Fixed launching of QtWebProcess.exe by changing default libexec directory to 'lib'. Task-number: QTBUG-29661 Change-Id: Icbb15fb98474d6fef8ac9310f2e2b482d3282f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix module name format in displayed codeSze Howe Koh2013-02-111-5/+5
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtDBus -> Qt D-Bus QtMultimedia -> Qt Multimedia QtWidgets -> Qt Widgets Change-Id: I96a1523b37e294b10b203782074943c6ec55e34a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* avoid that we accidentally initialize XQMAKESPEC to an empty stringOswald Buddenhagen2013-02-011-5/+5
| | | | | | | | | there is plenty of tests which rely on the non-presence of the variable, rather than it being empty. Task-number: QTBUG-29400 Change-Id: Ifa8aa68192750521869767e2d4d3796794f4d8f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove somewhat pointless conditionalOswald Buddenhagen2013-02-011-2/+1
| | | | | | | if the user just set an empty spec, everything will go wrong anyway. Change-Id: I5ddaa2f0be1be96132260af8c869ba38e02eb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix minor typos in docs, printed messages & commentsSze Howe Koh2013-01-281-1/+1
| | | | | | | Missing apostrophes Change-Id: I3ef5e9d494fb7a37f8e6075f24cd3a274e572c23 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* configure.exe: Fix line feed characterDebao Zhang2013-01-251-8/+8
| | | | | | | | | config.summary has been opened in text mode, so the line feed character should be "\n" instead of "\r\n". Change-Id: Id73b0d698487cdd6f48902f3ae988c6a9fa59407 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Disable only accessibility bridge without dbus on linuxFrederik Gladhorn2013-01-231-2/+6
| | | | | | | | | | | | Keeping accessibility and only disabling the bridge will enable more builds to work. Warning about disabling accessibility disabled is needed because in QStyle it is used to discover semantics about widgets (if a toolbutton is in a toolbar). Change-Id: Iae4e6ab63479743bdd70cba4b1954ec7cf3f88e9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-188-8/+8
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* add missing space in front of "directwrite" flagOswald Buddenhagen2013-01-111-1/+1
| | | | | | Task-number: QTBUG-28917 Change-Id: I8b86b96a3fb6b65f71aea6954ba8dfa520f5d909 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* configure: Remove left over for -nokia-developer optionSergio Ahumada2013-01-041-7/+0
| | | | | | | This seems to be a left over from 52fc6694b87e93fe0828424bb26d9279785de3e7 Change-Id: Ib0d5868a099e53ec2c2af6be749a5496bbf1f145 Reviewed-by: Jeremy Katz <jeremy@panix.com>
* slash the -fast configure optionOswald Buddenhagen2012-12-182-97/+2
| | | | | | | | | it's completely broken, and i have no time to fix it properly now. configure runs no qmake -r by default any more, so it's fast enough. Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Consistently prefix all platform plugin libraries with "q".Samuel Rødal2012-12-111-1/+1
| | | | | | | | | | | | | This means the xcb plugin library will be named libqxcb.so instead of libxcb.so, which doesn't clash with the system's libxcb.so. We need to consistently apply this on all platforms for static linking to work. Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.priMiikka Heikkinen2012-12-101-0/+3
| | | | | | | | | | | | | | | Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable to specify the default QPA plugin. "CONFIG += qpa_default_plugin" statement in application .pro file will add the default QPA plugin into QTPLUGINS. "CONFIG += qpa_minimal_plugin" statement in application .pro file will add the minimal QPA plugin into QTPLUGINS. Task-number: QTBUG-28131 Change-Id: I12a241005f30b37467d783b50f0369b47e605e68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure.exe: fix -inotify optionRafael Roquetto2012-12-061-0/+3
| | | | | | Change-Id: Iaa844961b5fdd2056fcc9b008c11a3f3925ca3a4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use the same output dirs under windows as under unixOswald Buddenhagen2012-12-061-3/+3
| | | | | | | | the times when directory names starting with a dot were a problem under windows are sort of gone. for well over a decade. Change-Id: Ia1a0782c878a055cc5c094c6b3e4df0741368433 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move QT_{SOURCE,BUILD}_TREE back to .qmake.cacheOswald Buddenhagen2012-12-051-4/+2
| | | | | | | | | they cannot be legally used outside qtbase - it's the antithesis of modularization. Change-Id: I847844ea0ddce599f130f396d68cb61fa8f34135 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Moving the remaining variables assignments from .qmake.cache to qmodule.priAlexey Pavlov2012-11-301-3/+4
| | | | | | | | | | Moving variables to qmodule.pri allows to build all qt modules with user defined command line arguments passed to configure script. Task-number: QTBUG-27566 Change-Id: Ifa7991e9024df3fb4b1fd6536ee0d19b7c63d15e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* WINCE: Don't build angle by defaultAndreas Holzammer2012-11-301-1/+2
| | | | | | | | | | | | When having a directx sdk, angle does get auto enabled for all windows platforms. Windows CE directx builds on top of opengl es 2, so if there is directx, there is also a opengl es 2. So don't add more layers of indirection for Windows CE. As well angle does not build for Windows CE. Change-Id: I211a1de29431cd05d5cd60188f503d2cd299c9b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:02:24 +0000