summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* don't copy mkspecs to build directoryOswald Buddenhagen2013-06-121-36/+6
| | | | | | | 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>
* Update the code detecting the default include and library pathsThiago Macieira2013-06-071-16/+39
| | | | | | | | | | | | | | | Make it be one big AWK script instead of a ton of smaller processes. Also handle the defaults inside the AWK script for simplicity. Since the output is a qmake variable, we do not need to surround with quotes strings that don't contain spaces. Also, use a tee trick to print the verbose output: we get the actual output from awk. Change-Id: I4a48a917c988a6b03d2c3b6990765301287713ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-13/+26
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * remove bizarre perl detection magicOswald Buddenhagen2013-05-301-6/+0
| | | | | | | | | | | | | | | | | | | | the code makes no sense, and was added with the QNX port without comment. there is already a detection a few lines up. Change-Id: I18ec18604c37c7c42f2649a658dd22324d481dd3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * add -compile-examples configure optionOswald Buddenhagen2013-05-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Android: detect Linux 64 bit host architecturePaul Olav Tvete2013-05-241-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the easy fix: looking at what is supported by the NDK. If people have weird setups, then they have to specify -android-ndk-host. We do actually detect the host architecture later, but using that would be a much bigger (and riskier) change. Task-number: QTBUG-31275 Change-Id: I18db878031baa2e1ee2fa4beff364d58d8bd3c7a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-231-162/+197
|\| | | | | | | | | | | | | | | | | | | | | 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: Remove libgnustl_shared.so copy hack.Ray Donnelly2013-05-231-4/+0
| | | | | | | | | | | | | | | | | | It's not needed, and when $outpath/lib doesn't already exist (when shadow-building for example), $outpath/lib ends up being a copy of libgnustl_shared.so, when it really must be a folder. Change-Id: Iaf3af6f4183090137043549cb8d9899c2bc92f24 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * configure/Mac: Handle errors by xcrun.Friedemann Kleint2013-05-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | xcrun occasionally prompts for a license or outputs errors which results in: configure: line 2488: [: : integer expression expected Check the output and bail out on error. Change-Id: Ic1ae62b5f19cf87365c38901e98d6b385cdb39a4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * get rid of syncqt wrapper scriptsOswald Buddenhagen2013-05-131-11/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
| * don't try to shadow scripts which are not even thereOswald Buddenhagen2013-05-131-11/+0
| | | | | | | | | | Change-Id: Ia8517ebc43488b8b92b142fa6b9f483b8fbe8a32 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * install host libraries into -hostprefixOswald Buddenhagen2013-05-131-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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>
| * MSYS: Force relpath and outpath into same pathing namespace.Ray Donnelly2013-05-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | MSYS bash (and other msys-compiled executables) perform path transformation much like Cygwin. This causes syncqt path substitution to not work correctly, so use 'pwd -W' to get the Windows version (though with forward slashes) of both relpath and outpath. Change-Id: I808e3ef9206ed5f5bd8b6879d12afe664e589e0c Reviewed-by: Alvaro Burnett <alvaroburnett@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Make the configure summary even prettierThiago Macieira2013-05-081-124/+115
| | | | | | | | | | Change-Id: Ie040fe142a5ee74c7f38a3fd2e6806b41aec4976 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Make access to xkbcommon_workaround.h more genericGatis Paeglis2013-05-071-0/+2
| | | | | | | | | | | | | | | | | | | | It makes more sense to keep this workaround header together with the other libxkbcommon files for a better access point since it's used by several *.pro files. Change-Id: I63d4eb58f6e7f3852834e41c4b6e058a2c962233 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Add xcb-xkb to 3rd party libsGatis Paeglis2013-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) -qt-xcb a) Use xkb from the 3rd party libs. As it is done for the other xcb dependencies when qt configure with -qt-xcb. 2) -system-xcb (default) a) If xkb found then use xkb from the system. (Currenly xkb is not enabled by default when configuring libxcb library). b) If xkb can't be found on the system then keyboard state will be updated from X11 core events. Change-Id: I7c3dbce6daa2cec52067cd5af80f19040233a0db Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Add libxkbcommon to 3rd party libsGatis Paeglis2013-05-071-17/+52
| | | | | | | | | | | | | | | | | | | | This library is required by the XCB platform plugin. As we depend on very recent version of this library and it might not be available in base repositories of distributions, users can use -qt-xkbcommom switch to build Qt with the bundled version. Change-Id: I0ed2a5cc2f1df98b0e7cc926cabfa69818674e08 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Make the configure script to accept "-no-harfbuzz" switchGatis Paeglis2013-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | ./configure -h lists "-no-harfbuzz" as a valid option, configuring with this switch gives an error message: "-no-harfbuzz: invalid command-line switch" Change-Id: I77aa68d17805170189150198dc9abea5f8cfa5c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Sanitize QT_COMPILER_SUPPORTS_xxx in qcompilerdetection.hTor Arne Vestbø2013-05-101-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of scoping the defines in qconfig.h, which relied on the Q_PROCESSOR_xxx defines and meant that we had to include qconfig.h after qprocessordetection.h, which added a whole bunch of other dependency issues. We now let configure write QT_COMPILER_SUPPORTS_xxx to qconfig.h as before, without any scoping, and then undefine the ones that don't apply for the given processor. This means we need to include qprocessordetection.h before qcompilerdetection.h in qglobal.h, but the former does not depend on the latter, so this should be fine. Change-Id: If00c00d405463e9626fa0f7f5e6b17f68778904f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-291-1/+2
|\| | | | | | | Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
| * Do not talk about `make confclean` in the top-level directoryJan Kundrát2013-04-231-1/+2
| | | | | | | | | | | | | | | | The configure script does not actually produce a "confclean" make target. Task-number: QTBUG-27735 Change-Id: Ia0f9e33e50c35cc6bb2941853e518a40fc9edaee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-221-140/+170
|\| | | | | | | Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
| * Move the reporting of xkbcommon's warning closer to the bottomThiago Macieira2013-04-151-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | The warning is more likely to be seen if it's closer to the end of the output. Also report whether we found xkbcommon in the main output. Note that xkbcommon is used by Wayland too, so it's not dependent on QPA or on the XCB backend. Change-Id: I143327eea4e17fa06bc7c24c677ae0bd00e65711 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Re-shuffle the configure outputThiago Macieira2013-04-151-127/+146
| | | | | | | | | | | | | | | | Keep options sorted and use indentation to group together related options (QPA backends, image formats and SQL drivers). Change-Id: I97d330a13a4daa4567ff741dc26e11f458ae7f53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Android: Implement a hack for qmake /dev/null usage on Windows.Ray Donnelly2013-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Neither /dev/null nor NUL work with Qt on Windows. For now, use an empty file for the cases where qmake is used with /dev/null. I filed a bug for this: https://bugreports.qt-project.org/browse/QTBUG-30562 Change-Id: If5351214ae5a0ebe50ae46b155c327ca0dc59f98 Reviewed-by: Alvaro Burnett <alvaroburnett@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * fix padding periods in configure help textIvan Romanov2013-04-151-7/+7
| | | | | | | | | | | | | | | | | | | | A gap after option name is needed to select it with double-click. Also I added padding periods for -testcocoon because it has no them before. Task-number: QTBUG-30589 Change-Id: Ib5b970f9b17cad43609fbc53dd05a995aaf29b45 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * iOS: Automatically disable rpath since it's not supportedTor Arne Vestbø2013-04-121-0/+1
| | | | | | | | | | Change-Id: If4f707f5d32a1a38b9ca11d4f1703e1f20bb3c20 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * iOS: Automatically disable pkgconfig, and don't build examples and testsTor Arne Vestbø2013-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | So that the user doesn't have to pass -no-pkg-config and -nomake, when we already know that those flags are needed and that the build will break without them. Change-Id: Ic07e02bc1800f177cf09f704104c1a76bfc50aa2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-04-171-8/+1
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-121-8/+1
| |\| | | | | | | | | | Change-Id: Iee73c93067c5822d8dd51a8692e6da9df4ba49f5
| | * Don't use UNAME_MACHINE on LinuxThiago Macieira2013-04-101-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need it. Let linux-g++ be the default on all Linux builds, period. Task-number: QTBUG-30590 Change-Id: I26c73bf4f054684763b64ef5651b3488363ea7a1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Scope QT_COMPILER_SUPPORTS_xxx by processor architecture in qconfig.hTor Arne Vestbø2013-04-131-8/+20
| | | | | | | | | | | | | | | Change-Id: Ie306b7b26e7dde641177ad54daf4365085fe9dce 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/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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/+8
| | | | | | | | | | | | | | | | | | 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-6/+29
|\ \
| * | Merge branch 'stable' into devSergio Ahumada2013-04-101-6/+29
| |\| | | | | | | | | | Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464
| | * Verify Xcode installation more thoroughly before relying on itTor Arne Vestbø2013-04-091-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We depend on Xcode for building Qt itself and user application on Mac OS. The user may have an Xcode install that is not set up properly, in which case we would fail compilation in mysterious ways. Instead we try to detect misconfigured or missing Xcode installs as early as possible. We try to detect if an Xcode install has not been chosen yet, and if the user has not accepted the Xcode license agreement. We need to do these checks both in configure, as early as possible, and in mkspecs on Mac OS, as we need to error out if the user tries to build an app with the Qt SDK, but with a broken Xcode install. Change-Id: I4e3a11077a61dc5d4ee2c686d01044a9bb2c1c79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Use absolute paths for Xcode helpers such as xcodebuild/xcrun/xcode-selectTor Arne Vestbø2013-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always use the xcodebuild/xcrun/xcode-select binaries in /usr/bin, as these will dispatch to the right binary based on what Xcode version has been chosen using xcode-select -switch. This fixes an issue where a tool was in the path from another Xcode installation. We can rely on the tools as they are present on a clean Mac OS install. Change-Id: I1d3cc1e92604f9be6d6f14639cb6322234edd696 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * iOS: Skip modules that don't build yetTor Arne Vestbø2013-04-081-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic0f39d7fb5a7f435f31dc6897a0a9266d1d7b0ef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Enable C++11 on OSX when using ClangTor Arne Vestbø2013-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we have to bump the deployment target to Lion (10.7), as the LLVM 'libc++' C++ standard library does not support Snow Leopard (10.6). For iOS the deployment target has to be bumped from 4.3 to 5.0, but we don't enable C++11 by default yet as it's not tested enough on iOS. Users who wish to deploy to 10.6 need to build their own Qt, passing -no-c++11 to configure. Change-Id: I7b5d20ab002db889d1091a4b7ff600f62caa7f06 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | | * make the libexec default on windows bin/ after allOswald Buddenhagen2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-04-041-3/+5
|\| | | | | | | | | | | refs/staging/dev
| * | Ensure GCC prints its messages in English when we parse themThiago Macieira2013-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We're trying to parse GCC output, so let's make sure that they are in English. I've seen some reports that "search starts here" was translated to some locales. Change-Id: If09b1f45607f65d054496db65418e413b8aa8d48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | don't try to de-duplicate QMAKE_DEFAULT_{INC,LIB}DIRSOswald Buddenhagen2013-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the de-duplication has the side effect of sorting, which is a very bad idea: x-compilers tend to append the host library paths at the end, and we really want them to stay at the end. and the lists should have no duplicates to start with. should we find a compiler which breaks this assumption, we can use qmake's $$unique() strategically. Change-Id: I01560e3c33736c2dfffdb05d5c960c492439c946 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | iOS: Enable NEON optimizations, except for the pixman draw-helpersTor Arne Vestbø2013-04-041-2/+1
|/ / | | | | | | | | | | | | | | | | | | We used to disable NEON completely, as the iOS toolchain does not handle the GAS syntax of the pixman draw-helpers. But we can limit the disabling to just the draw-helpers, which means we get NEON optimization of eg. QImage and QString. Change-Id: If350b06ce521cca8b24468be5a168ff21e9e7124 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Revert "eglfs: Disable eglfs when evdev is not present"Michael Brasser2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | evdev support in eglfs is now guarded by QT_NO_EVDEV, so this check is no longer required. This allows eglfs + tslib to be a supported combination. This reverts commit a95e396a83930de14c6964dbf3724d6162d8400b. Change-Id: Icf7c15121b7eca1131d412b05b956cd5d7f189ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Allow tslib to be specified at configure time.Michael Brasser2013-03-261-0/+20
| | | | | | | | | | Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 14:09:42 +0000