summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable' into devSergio Ahumada2013-07-113-2/+12
|\ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * add support for Visual Studio 2013Joerg Bornemann2013-07-043-2/+11
| | | | | | | | | | | | | | | | | | | | Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Change-Id: I6e63a4d679727a8a3f068f377956185996d72bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Disable xkbcommon when building for QNX from WindowsMatt Fischer2013-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | A previous commit (7582bb5) added a line to disable xkbcommon when building for Android. A similar line needs to be added to handle QNX builds. Change-Id: I34e91d989567b17e7e21b87d9c377360e4e56f68 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-8/+13
|\| | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * introduce "secret" configure -top-level optionOswald Buddenhagen2013-06-261-2/+13
| | | | | | | | | | | | | | | | | | | | shifts the makefile generation one directory level up. this allows the top-level configure to leave the makefile creation entirely to the qtbase configure. this is not very clean modularization-wise, but consistent with -skip. Change-Id: I7ee2d2f29f2e6619d61fe9b55faa0bacdf3c44c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove pointless qmake -o argumentOswald Buddenhagen2013-06-261-2/+0
| | | | | | | | | | | | | | | | it's already done by the working directory. the unix configure already did it that way. Change-Id: Ia88d0877a2e24bc40a7083c2164982dec47f913b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * simplify qmake callOswald Buddenhagen2013-06-261-1/+1
| | | | | | | | | | | | | | | | the directory is sufficient nowadays. the unix configure already did it that way. Change-Id: I887e5ad594aef1f7bf5f4f92a6bdf0a13e4d0372 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove pointless variablesOswald Buddenhagen2013-06-261-5/+1
| | | | | | | | | | Change-Id: Ia4cd2292bdea49c198ee1429ab4d3f87697c3ed1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-202-10/+17
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| * complain about bad arguments to -make/-nomakeOswald Buddenhagen2013-06-192-2/+15
| | | | | | | | | | | | Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't try to not build non-existing partsOswald Buddenhagen2013-06-171-2/+2
| | | | | | | | | | Change-Id: I20896f15f7ab91aac8a9b6977fd3a253bc0e187d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't claim that we need perl for shadow builds any moreOswald Buddenhagen2013-06-121-6/+0
| | | | | | | | | | | | | | amends 0a1b89bff, which took care only of the unix version. Change-Id: Idb82881a9c47e67c973500721fd499bcf41a848b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-131-4/+39
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-4/+39
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| | * Only process vcproj files if we do a -fully-processOswald Buddenhagen2013-06-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A top-level vcproj (really a .sln file) only makes sense when sub- projects are generated too, since the solutions generator will ignore all non-generated projects. Originally-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Change-Id: Iff09279d5760b5114a4cfb9b58ad677f2f69fa58 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * run syncqt only for builds from gitOswald Buddenhagen2013-06-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the logic in the configures was even trying to express that, only that nowadays we always ship syncqt, so the tests were kinda pointless. this frees us from the perl dependency for non-developer builds of packaged modules (except for webkit, which needs almost every scripting language on earth anyway). obviously, this requires that the packaging scripts run syncqt in the source dir before tarring up the sources. note that for repositories other than qtbase, the -version argument needs to be passed to syncqt. Task-number: QTBUG-29465 Change-Id: Ic929ab17a5de4b30fbf48b3aa9bfa3b4d2ef37d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * let configure create the forwarding qconfig.h againOswald Buddenhagen2013-06-031-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this avoids that syncqt needs to forward to a yet unexisting file (which will have a yet unknown location, when syncqt is run at packaging time already). the %inject_headers syncqt config variable remains, so it can be told not to purge "foreign" files. Change-Id: I127ff6e0b7d5702fb0acaee9a5b7940b482d3608 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | don't copy/symlink doc/global to build dirOswald Buddenhagen2013-06-121-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead, use the files directly from the source dir. Change-Id: I03b728c66de6e03cade6dc153dcc78cea8e3f606 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | don't copy mkspecs to build directoryOswald Buddenhagen2013-06-121-6/+3
|/ / | | | | | | | | | | | | instead, teach qmake to use the mkspecs dir from the source dir as well. Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-0/+20
|\| | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * add -compile-examples configure optionOswald Buddenhagen2013-05-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this overrides the magic that makes examples only install their sources in production builds. packagers may want to force the build of the examples, so they can package them up for demo purposes. this is actually why we formerly had the split between demos and examples ... Task-number: QTBUG-30788 Change-Id: I5633f69404c5aa6846f5496e8f161a273a7a7da3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-233-148/+62
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
| * Android: Disable xkbcommon in configure.exeRay Donnelly2013-05-231-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-31220 Change-Id: I711fa5d37cb58216199cc0ce479a14a3300d8cb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * move detectArch() call right after autoDetection()Oswald Buddenhagen2013-05-221-4/+7
| | | | | | | | | | | | | | | | | | | | it belongs there (technically, it would not hurt to actually call it from within autoDetection()). Task-number: QTBUG-31095 Change-Id: I7eb53762513eb9cebfd22317c8f44fe123eb91dd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * reality adjustment: rename generateSystemVars() => prepareConfigTests()Oswald Buddenhagen2013-05-223-3/+3
| | | | | | | | | | Change-Id: I3f9cd8b8cdb54d682d0207f28168f4e518b98280 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * purge dead output-related codeOswald Buddenhagen2013-05-221-12/+0
| | | | | | | | | | | | | | QTBUILDINSTRUCTION is not evaluated anywhere anymore. Change-Id: Ie23f61f5a25594591efdafdc49e279f13623b049 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 12:20:18 +0000