summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add IMPORTED targets for the GL libraries used by Qt.Stephen Kelly2013-04-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | There may be multiple libraries specified in the mkspec, such as EGL and Mali, as used in devices/linux-sh4-stmicro-ST7108-g++, so create an imported target for each one. Also populate the Qt5Gui_EGL_LIBS variable with all created imported targets. Similar variables are created for the used OPENGL implementation. In the case of using the packaged ANGLE library, we already know the exact locations of the binaries. This makes it possible for third parties to use the same GL implementation as used by the Qt build itself. As these are used only privately by QtGui, they are also added to the DEPENDENT_LIBRARIES of that target so that they are found for rpath-link usage. On some platforms (eg Raspberry Pi), multiple include directories must be set to include egl.h, as the headers it includes for vcos are a bit scattered. Task-number: QTBUG-29132 Change-Id: I1126da3d37cd51c88d3670347c8b6405b285efb5 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* purge obsolete filesOswald Buddenhagen2013-04-192-3/+0
| | | | | | | the warnings should have been acted upon before 5.0. Change-Id: I20a4673d7ec80e0252aa39289c6718fe80799de7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add the GL headers to cmake variables.Stephen Kelly2013-04-191-0/+9
| | | | | | | | | | | | | | If building angle ourselves, that's just the basic Qt include dir, and if using an external gl, look for it in the places specified in the mkspec. As the qopengl.h header includes the gl header, this is a 'public include dependency' of QtGui, so it is added to the relevant variable and the INTERFACE_INCLUDE_DIRECTORIES of Qt5::Gui. Change-Id: I8c2c1782e0a2600032771175444b087da28433fc Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Handle usr-move without forcing absolute pathsStephen Kelly2013-04-193-9/+33
| | | | | | | | | | | | | | | | | | In qtbase commit 7ac58d1ff0815566ba1de09519299b5119e5ee91 (Make cmake packages installed to /usr non-relocatable., 2013-02-11), we made cmake config files non-relocatable if they were installed to the /usr prefix. That was assumed to mean that this was a distro or platform package, and was a workaround for the usr-move problem on Fedora and ArchLinux. However, cmake bug http://public.kitware.com/Bug/view.php?id=14041 showed that forcing absolute paths in this situation is not desirable in cross compiling scenarios. CMake commit 6c613b433c45efb0bb013a6bd668cbb8ac740259 (Handle usr-move without forcing absolute paths (#14041), 2013-04-03) addressed the problem in CMake, and this commit is an equivalent. Change-Id: I065a6230bc618aa980fae6ca511ae10df4cd62c2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Harden check for SDK platform name on Mac OSTor Arne Vestbø2013-04-181-2/+2
| | | | | | | | | | We now use an absolute path, to prevent picking up the wrong plutil binary. In addition we pipe the possible stderr output of plutil and xpath to the null device, so that the final QMAKE_MAC_PLATFORM_NAME will be empty in case of any errors, and caught by the isEmpty() check below. Change-Id: I8ad24bf63162a76410c2ae223dd2fc48e7886bbf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Fixes for building under MSYS.Ray Donnelly2013-04-171-0/+5
| | | | | | | Need to set MINGW_IN_SHELL to 1 and QMAKE_DIR_SEP to / Change-Id: If470f1a4617555d6bc551e8cdf917779d0e64e62 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Don't use the CMake MinGW if cross-compiling.Stephen Kelly2013-04-161-1/+1
| | | | | | | | | | This way, the default generator is used when cross compiling for mingw. Change-Id: Ie536f1bca35ea38aec1232cdd95fc063c4f23e70 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
* added QMAKE_EXTENSION_STATICLIB to wince mkspecBjoern Breitmeyer2013-04-151-0/+1
| | | | | | | | | | | Qmake requires the information which extension is used for static libs on a platform. As the ci for windows ce is pretty new, this was not noticed before. Change-Id: I45b0c9c59980cd352371c00aa59502e5a394e337 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Added qtwaylandscanner rules to wayland-scanner.prfSamuel Rødal2013-04-151-7/+43
| | | | | | | | In preparation of change in qtwayland. Change-Id: I337ea9f48bf692f31e406c47d9256ee0263d33f0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Minimize the contents of the INTERFACE_INCLUDE_DIRECTORIESStephen Kelly2013-04-111-4/+5
| | | | | | | | | | | The property only needs to contain the direct include dirs of a target. For example, Qt5::Gui does not need to contain the include/QtCore directory because it already has Qt5::Core in its LINK_INTERFACE_LIBRARIES. Change-Id: I69612f42c29e6056b3d15399498d041d43a0dd6b Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Android: Remove qdevice.pri warning in configure stepEskil Abrahamsen Blomfeldt2013-04-111-1/+2
| | | | | | | | Use the appropriate way to load the .pri file which also checks for its existence before loading it. Change-Id: I7d36da1593bb7fa1b5f6fd4d10b69e20c6aaa836 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Generate Win64 code when testing 64bit Qt on Windows.Stephen Kelly2013-04-101-0/+4
| | | | | | | | | | | | | | This should fix the issue reported here: http://thread.gmane.org/gmane.comp.lib.qt.devel/10746 From: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/6590/focus=6593 Change-Id: I523de5c1a89f08bd832a684fcff7c57565ebc5c9 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Use CMake facility for verbose makefiles instead of an env var.Stephen Kelly2013-04-101-4/+2
| | | | | | | | | It should also have an effect for Visual Studio project files, not just makefile generators. Change-Id: I395071f09b29a6e8967a3d44e41d30480ae783f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add keys required for ad-hoc distribution.Morten Johan Sørvig2013-04-091-0/+8
| | | | | Change-Id: I3e52cc0105e8d9d5a38e59b1f6e1071fe302f61c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Verify Xcode installation more thoroughly before relying on itTor Arne Vestbø2013-04-093-4/+10
| | | | | | | | | | | | | | | | 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-092-4/+4
| | | | | | | | | | | 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>
* Handle errors when sysrooting tools on MacTor Arne Vestbø2013-04-081-1/+3
| | | | | | | | | | xcrun will spit out errors to stderr and nothing to stdout if it fails to find the tool in question. By checking for an empty return value and skipping the sysrooting we guard against mangling the tool variable. Change-Id: I68f59a6c8116696dd75cceed7b33ac666f3468b2 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* mkspecs are installed to QT_HOST_DATA instead of QT_INSTALL_ARCHDATA.Volker Krause2013-04-081-4/+4
| | | | | | | These are the same for normal builds, but differ when cross-compiling Qt. Change-Id: I75eccc6f4b67b440a08c4aba41aabb7df686c9f9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Enable C++11 on OSX when using ClangTor Arne Vestbø2013-04-053-0/+13
| | | | | | | | | | | | | | 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>
* Test that the CMake files create appropriate version variables.Stephen Kelly2013-04-051-1/+19
| | | | | | | Change-Id: I1d8061302fbb8494b5ae31e20a644745fe969f10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't redundantly define cmake package *_VERSION variablesStephen Kelly2013-04-051-3/+1
| | | | | | | | These variables are set by the ConfigVersion.cmake file already, so no need to maintain them manually in the Config file too. Change-Id: I73d949fb22052f4f6acbc1f70518e73f8fbf7c9c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Look for cmake package dependents only in the parent directory.Stephen Kelly2013-04-051-1/+1
| | | | | | | | | | Fedora uses configure options to set the install prefix to a location which does not contain the cmake config files. Rather than finding dependencies from the installation prefix, find them in sibling directories instead. Change-Id: I06974e9655d0dda2a18064d0f9a33997cf2cb2d3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix pathing problem with our dx.batRay Donnelly2013-04-051-1/+1
| | | | | | | Need to look in <android-sdk>/platform-tools/lib for dx.jar Change-Id: I104cf157ce1795e907cca31b37c62163248b8d77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Include PRECOMPILED_DIR in dirs fixed by fixExclusiveOutputDirs()Tor Arne Vestbø2013-04-031-1/+1
| | | | | | | | | It's written to qmodule.pri by configure with a hard-coded path, and hence need fixing up or appending, depending on which exclusive builds are used. Change-Id: I069c04438dc303868a76349c9bdd385adc074c0a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-031-0/+3
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+3
| |\ | | | | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | * ensure that each module has a .qmake.cache when properly qmake'dOswald Buddenhagen2013-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | this makes properly configured modules (whose top-level project file was evaluated) uniformly recognizable. Change-Id: Ib127df2becb2ff7f51ee8cc5a194ff168b41c227 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Load sdk.prf first, if enabled, so that other features can use QMAKE_CXXTor Arne Vestbø2013-04-031-0/+4
|/ / | | | | | | | | | | | | | | Extra-compilers such as objective_c.prf may reference QMAKE_CXX, so we need to sysroot it before it's used. Change-Id: I1e367b3d0816096300a441786619f298134de0a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Portability fix for java usage on Windows.Ray Donnelly2013-04-031-1/+1
| | | | | | | | | | Change-Id: Ic72957e21b2edc92d2ca8d99099f221ffeeb8c95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Enable the java feature on Windows.Ray Donnelly2013-04-032-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in dx.bat in the Google Android SDK tool where relative paths do not work correctly. We need to use our own version of this tool until: https://android-review.googlesource.com/#/c/52680/ ..is merged. Change-Id: I451a3239590919d014a673f3e8e17244e96676ab Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android on Windows: Add 2 missing qmake variables.Ray Donnelly2013-04-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | In order to build Android Qt on Windows via cmd.exe using the unix makefile generator, mkspecs/common/shell-win32.conf needs QMAKE_SYMBOLIC_LINK and QMAKE_LN_SHLIB Change-Id: I1b3eded66cec06ab131f127c1d46b99124613561 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | move the setup of QT_INSTALL_DOCS from qdoc to qt_docs.prfOswald Buddenhagen2013-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | this is a qt specific option and really should not be hard-coded. also, the implementation used undocumented api that is internal to the bootstrapped process, which made it impossible to de-bootstrap it. Change-Id: If706960671744e64a9a7c366437977a800a6058e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | prefer 'release' for non-bootstrapped host build_all configsOswald Buddenhagen2013-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | ... like qt_tool does. otherwise we get linker errors with debug builds on windows. Change-Id: I583f277ff3fb75c9fe5f305a6f1b5d066b840c07 Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix '=' alignment and replace tabs in *.conf (whitespace only change)Axel Waggershauser2013-03-27123-2810/+2810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Populate includes, defines and pic flags in target interfaces.Stephen Kelly2013-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used by features in CMake 2.8.11. This matches the features in FindQt4 in that version of CMake, namely that the IMPORTED targets contain the appropriate INTERFACE_INCLUDE_DIRECTORIES and INTERFACE_COMPILE_DEFINITIONS and that the qtmain.lib static library is automatically linked to on Windows by executables. Additionally, the INTERFACE_POSITION_INDEPENDENT_CODE property is set appropriately if Qt requires users to use position independent code. Change-Id: Ide341f43fcaf7d722a7bdf1a12b1071c7e548ccc Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | raspberry pi: add /opt/vc/include/interface/vmcs_host/linux to GL includesv5.1.0-alpha1Volker Krause2013-03-271-1/+3
| | | | | | | | | | | | | | This matches upstream changes on https://github.com/raspberrypi/firmware/ Change-Id: Ie28c2fa574d5cd097c033926970db40e8904e42e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Revert "Don't duplicate the 'top-level' include dir in all modules."Stephen Kelly2013-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This will likely fix some odd cmake related tests in the CI. This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef. Conflicts: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in src/corelib/Qt5CoreConfigExtras.cmake.in Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00 Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Fix the CMake tests with CMake release candidates.Stephen Kelly2013-03-261-0/+2
| | | | | | | | | | | | | | | | The version number parsing needs to handle the reported version string. Change-Id: Ifd34b2c86b21a1c5e4c91a43447468ca6feab8cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Get more information from failing cmake tests.Stephen Kelly2013-03-261-1/+4
| | | | | | | | | | | | | | Enable verbose makefile output which will appear in failure logs. Change-Id: I005069c122f46887f6095034d9cf1a3d2fdbc750 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix whitespace issues in *.prfAxel Waggershauser2013-03-223-21/+21
| | | | | | | | | | | | | | | | Replaced tabs with spaces to align with space-indented code and removed some trailing whitespace. Change-Id: I4930afc3df206ef8ee96de3e69f0d69fc4a1c77c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Update WEC7 ARM mkspec.Janne Anttila2013-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Added QT_NO_CLIPBOARD, QT_NO_ACCESSIBILITY and opengles2 libs. Clipboard and accessibility are not supported in WEC7. Opengl ES2 libs are required for building qtgui (and other opengl dependent) modules. Change-Id: Ie45612bd7bada00bfcb92a0885c4bd685b82bd02 Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-2111-27/+23
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * activate example (non-)build magic only in configured treesOswald Buddenhagen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | otherwise we assume that the user is trying to build a random example which just happens to live inside a qt module's repository. Task-number: QTBUG-29756 Change-Id: I17f217b4235fbe04f2c49d1d92ce08b86bb259b9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * 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>
| * fix LD_LIBRARY_PATH setup of check targetsOswald Buddenhagen2013-03-151-5/+2
| | | | | | | | | | | | | | amends 4c34b418 Change-Id: Id9d214fe936d947aaea4a56fd724ad50381032e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix replacement base pathOswald Buddenhagen2013-03-152-2/+2
| | | | | | | | | | | | | | | | this affects only webkit when doing module-by-module installation, so it went unnoticed. Change-Id: Iab87f4a76fcb0fa9a1b1d6bcab9a73756e416120 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * enumerate modules in QT_MODULES, not QT_CONFIGOswald Buddenhagen2013-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_CONFIG is supposed to contain configure output, not a list of modules. for example, enumerating modules is not cleanly possible if modules are mixed with other flags. the conflation was merely historical, due to webkit and phonon doing it this way in the preliminary qt4 modularization. we now have a much cleaner way to query modules (qtHaveModule(<module>), or less recently, !isEmpty(QT.<module>.name)), which is already used throughout Qt. the old way was supposed to be removed for 5.0 already, but it slipped. better do it now, before people actually start using it. Change-Id: Iabdf0cdfaab9cd674f634f4c6ece105b2039c850 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * broaden the effect of CONFIG+=force_independent somewhatOswald Buddenhagen2013-03-154-6/+7
| | | | | | | | | | | | | | | | | | | | | | modules which demand it (i.e., qtwebkit) need forwarding pris, etc., even when not making a -prefix build. Change-Id: Id405be8763e94cc074854f799bd785e9cdf62e8e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * fix parallelized "jom install"Oswald Buddenhagen2013-03-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike unix' mkdir -p, windows' md complains if the directory already exists. the workaround is a quite complex command, so the so far used concept for assembling the command line from pieces was replaced with a single template. for symmetry, adapt the makefile existence check to the new concept as well. QMAKE_CHK_EXISTS and QMAKE_MKDIR_CMD were added, with hard-coded fallbacks (ugly). QMAKE_CHK_FILE_EXISTS and QMAKE_CHK_EXISTS_GLUE (introduced in 5.0.0) are simply deleted again. QMAKE_CHK_DIR_EXISTS and QMAKE_MKDIR remain for legacy reasons, as qmake emits them into the Makefiles, and custom commands may rely on their presence. Task-number: QTBUG-28132 Change-Id: I3d049cb5d26947e5c3d102d0c2da33afb2a95140 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-20148-2196/+1427
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:03:34 +0000