summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add CFBundleVersion to the Info.plist files.Morten Johan Sørvig2014-10-019-0/+18
| | | | | | | | | | | | | Add @FULL_VERSION@ -> Qt version substitution to unixmake2. This makes the Qt-generated Info.plist files compliant with the bundle signing/validation process. Task-number: QTBUG-32896 Change-Id: I1818f028c2f740d699629dd78cc0fe6ffaf94a1c Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Don't make Info.plist for debug framework bundlesGabriel de Dietrich2014-10-011-2/+5
| | | | | | | | | | | | | | | We do so by setting a 'no_plist' config property. Can be overridden with 'force_debug_plist'. The debug version of Info.plist would overwrite the release version, and it also happens to contain invalid data. In particular, CFBundleExecutable would contain the _debug suffixed libname, which it shouldn't. See the entry about CFBundleExecutable on https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Task-number: QTBUG-32894 Change-Id: Ideb018e4768a7c4e276e1b07d77937451f6db6a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* actually use DIRLIST_SEPARATOROswald Buddenhagen2014-10-011-1/+1
| | | | | | | | | it's QMAKE_DIRLIST_SEP and DIRLIST_SEPARATOR. pure evil. Task-number: QTBUG-41668 Change-Id: Ie2f6db6530e0f50bc1ce5db593180e7ad703766b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* create_cmake: Fix mingw plugin pathTimothy Gu2014-09-291-5/+10
| | | | | | | | MinGW static libs use libfoo.a format, and not foo.lib. Change-Id: I899adca8ec0b1c8430f5b6c4f18ad0ea1dc6d398 Reviewed-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs.Raphael Kubo da Costa2014-08-153-12/+0
| | | | | | | | X11 and the GL libraries are installed into /usr/local like other software, and this has been the case for many years. Change-Id: Ied4d9d61154014db3861bdbd6a5bdbe68e76f878 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove reference to gdb_dwarf_index from the freebsd-clang mkspec.Raphael Kubo da Costa2014-08-151-1/+0
| | | | | | | | Follow-up to 9de2853a ("Remove automated generation of dwarf index"): gdb_dwarf_index.prf does not exist anymore, so stop referencing it. Change-Id: I22464d5b81a50a2f58218d74a424f3a790aa1df0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Set iMX device specific compiler flags to QMAKE_CFLAGSSamuli Piippo2014-08-142-10/+4
| | | | | | | | | Device specific compiler flags need to go to QMAKE_CFLAGS, so that they are used also when --force-debug-info is used. Removed separate _DEBUG and _RELEASE, since the gcc-base provides same defaults. Change-Id: I6ce0133a1acf419261b7756525185f43581d2a9c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* avoid that CROSS_COMPILE affects host buildsOswald Buddenhagen2014-08-011-1/+3
| | | | | | Change-Id: Iee40cfd87d7ec640fb4b3526e58317bdc8a778c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into ↵Oswald Buddenhagen2014-07-311-6/+1
|\ | | | | | | refs/staging/5.3
| * Merge remote-tracking branch 'origin/stable' into 5.3Oswald Buddenhagen2014-07-301-6/+1
| |\ | | | | | | | | | Change-Id: I2a044d44ca991ba20ddd710053b85afb51e362d3
| | * Remove -Wcast-align from QMAKE_CXXFLAGS.Lisandro Damián Nicanor Pérez Meyer2014-06-271-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x86 doesn't care about alignment, and on all other platforms where it does something it causes build errors, so instead of removing it on those platforms just don't enable it at all. Change-Id: Idfeb387099b28af60ba161b6ca678b7c9df17fe1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Android: export ANDROID_SDK_BUILD_TOOLS_REVISION.BogDan Vatra2014-07-313-22/+20
|/ / | | | | | | | | | | | | | | | | | | It's needed by androiddeployqt tool to run "zipalign" tool and to set it to gradle properties. Task-number:QTBUG-40481 Change-Id: I3dd665a7461a4e981867cdad75a50940e46a5ae6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Android: Fix compiling targets with space in nameEskil Abrahamsen Blomfeldt2014-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | We have to escape the target name to avoid compilation errors. This fixes the compilation failure in the qprocess autotest. [ChangeLog][Android] Added support for building libraries with spaces in name. Change-Id: Ib98ba261fb3a4cc1e835d0cd2f93aac6855a7c21 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | add support for device linux-arm-hisilicon-hix5hd2-g++Xu Feng2014-07-023-0/+204
| | | | | | | | | | | | | | | | | | | | 1. add qmake configuration for linux-arm-hisilicon-x5hd2-g++ using the arm-linux-gnueabihf-g++ crosscompiler 2. add eglfs platform hooks file: qeglfshooks_hix5hd2.cpp 3. support hisilicon platform hix5hd2 Change-Id: I22bdbe5785d1a6bc77715b8e8aa7caa22b62ddce Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | [bcm97425] Fix parameter issue in platformDestroy hookMathieu Gross2014-07-011-1/+1
| | | | | | | | | | | | | | Change-Id: Ie137314a3a3d480d10d7fe2a8505ce7d5708faba Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Delete qml_plugin_import.cpp file only during distcleanKai Koehne2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | For static builds of Qt Quick apps, qmake generates a qml_plugin_import.cpp file. Just like the Makefiles, it should be removed only for distclean, not in the clean step. This is what we do for non-qml plugins, too. Change-Id: I5a3f2e7d27c3ffd5161162a8a03e4dd9c9245af5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | CMake: Allow modules to specify the location of tests.Stephen Kelly2014-06-251-1/+10
| | | | | | | | | | | | | | | | Webkit has a different layout, so allow the tests to be found in the appropriate location. Change-Id: Iedbea6daada98a3c3efdbcfc1fe4df5d2c8cea6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | CMake: Report an error if unit tests are not found for a module.Stephen Kelly2014-06-251-0/+2
| | | | | | | | | | Change-Id: Ic1540cfb04bf975a14bf2b35f4402bd36046de67 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix installation of private headers generated by wayland-scannerOlivier Blin2014-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Private qtwayland headers were not installed at first build, since qmake was ignoring unexisting files from the install target. It required another run of qmake to have a proper Makefile generated. The rules for generated headers need CONFIG = no_check_exist, so that files get listed in the Makefile even if they do not exist yet (thanks to Loïc Yhuel for the pointer). Change-Id: I1a0278d629295a55a3ddcf5f8fb068a04ba5be47 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | CMake: Load plugin files unconditionally if present.Stephen Kelly2014-06-222-8/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-39171 Task-number: QTBUG-39451 Change-Id: Ie66bd6b787a0957fd6f7ea673b158ab5de3cc38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | install .lib files for static libs againOswald Buddenhagen2014-06-161-1/+1
|/ | | | | | | | | the no_dll switch has questionable semantics: it pro-actively breaks non-dll builds. therefore its usage needs to be limited to dll build. Task-number: QTBUG-39594 Change-Id: I98328e502693df835af565b5ec25ada2c1c168ad Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QNX: Fix build for QNX 6.5Bernd Weimer2014-06-052-2/+2
| | | | | | | | | | | | | | | | | QNX 6.5 does not have readdir64_r, which is selected by current qplatformdefs.h. There is only a reentrant version (readdir_r) which does not support large files and a large file version (readdir64) which is not reentrant. The reentrant version (readdir_r) will be chosen now. In summary, the following versions will be used: QNX 6.5: readdir_r (postfix '_r': reentrant version) QNX 6.6: _readdir_r (prefix '_' : extra stat info included) BB 10: _readdir64_r (infix '64': large file support) Change-Id: I00739f0e2054a32f52555309d03463a6c52e3d99 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* use the right env var in qmlplugindump callOswald Buddenhagen2014-06-051-3/+5
| | | | | | | | | qml2 needs QML2_IMPORT_PATH. this didn't affect non-prefix builds (which most developers use), so it wasn't too serious. Change-Id: I435dca151348669b66f091f9a9324cd69394284e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* unbreak static qml imports againOswald Buddenhagen2014-06-051-3/+10
| | | | | | | | | | | | a) qmlimportscanner has no built-in -importPath, so it can't be omitted even for non-prefix builds, and b) the QMLPATHS variable is also used further down, so we can't just do away with it. amends a658fa40. Change-Id: I42a47a82fe13694fbac3c4a3962ebbe1d7e7865b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* actually don't install qt dlls into lib/ any moreOswald Buddenhagen2014-06-052-1/+1
| | | | | | | | | it helps enormously to use the flag correctly. amends f0c34eb08f. Change-Id: I04a63cc59e133169d9f6677f2f88ef98fd5c524c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* pass (some) index dirs also during -prepare phaseOswald Buddenhagen2014-06-051-1/+15
| | | | | | | | | | | | qdoc uses the indexes as "precompiled headers" to obtain type info necessary to properly parse sources. the indexes needed are the ones the module actually depends on (publically). Change-Id: I6aad0b511d2534d584f7947c8d800300eede94ff Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* don't check for doc/ dirs' existenceOswald Buddenhagen2014-06-051-2/+1
| | | | | | | | | | | | | | | | | the doc/ dirs in the build dir won't be created until the docs have been built, so of course checking whether they are there during the qmake phase is counterproductive. this also means that we'll get some complaints about non-existing directories (for repos that don't create any docs). there is no reasonable way to query qmake which repos are affected, and writing shell-specific code to query it at make time seems a bit overengineered. Task-number: QTBUG-38862 Change-Id: Ie0588e75bfc39718fffd46f0df6785428e396eb2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* ensure that there is always an -indexdir argumentOswald Buddenhagen2014-06-051-3/+7
| | | | | | | | | | | | | | even if we are not doing a top-level build, we still need to specify an index dir. that may be the install dir or the qtbase build dir, depending on whether we are building against an installed prefix build or a non-prefix build (building against non-installed prefix builds outside a top-level build is inherently impossible). Task-number: QTBUG-35596 Change-Id: Ia37d429855480d3bfe36b7ee29e087029861bfc5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix/optimize QT_PLUGIN_PATH construction in qtAddTargetEnv()Oswald Buddenhagen2014-06-052-12/+18
| | | | | | | | | | | | | instead of adding all possible plugin paths (for which QMAKEMODULES wouldn't have been a reliable source anyway), only add the paths of plugins of the necessary types. this necessitates that we create qt_plugin_<foo>.pri files also in shared builds of qt when making a prefix build. we don't install them unless it's a static build, though. Change-Id: Ib56b009562a7131d4dc4dfc259b34ec6581b0f77 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix VCLibs dependency in WP8.1 manifestAndrew Knight2014-06-031-0/+1
| | | | | | | | CRT dependencies should contain "Phone" in the name. Change-Id: I1b0de01df6a016c20b59232f6068e9bb87e3f18c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* CMake: Fix build with unversion_libname configurationDaiwei Li2014-05-301-0/+4
| | | | | | | | | | a162a3cb (Android: Add "unversioned_libname" configuration, 2014-04-23) removed the version for shared libs on Android. This change updates the generated CMake files to support that. Change-Id: Ia6ef04872c664bd4c31546456a82730babed2910 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* fix C4275 warnings for MSVC 2010 buildJoerg Bornemann2014-05-231-1/+1
| | | | | | | | | | | | | The _HAS_EXCEPTIONS=0 define that was introduced in commit f59083636b89fc9b7983f9a0758a79f2980826dc leads to lots of C4275 warnings: non dll-interface class "stdext::exception" used as base for dll-interface class "std::bad_cast" from the <algorithm> include in qglobal.h. Newer versions of MSVC do not have this problem. Task-number: QTBUG-39126 Change-Id: Ieea5adde649fe16e6b41fbbb23fd582b3bb12b89 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* fix qmlplugindump's import path constructionOswald Buddenhagen2014-05-231-3/+5
| | | | | | | | the location of the import paths have changed a long time ago. also, we can make use of QTREPOS now. Change-Id: Iee50854b7441968c3c60538e54d9312e53d39cb6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix/simplify the qmlimportscanner's import path constructionOswald Buddenhagen2014-05-231-7/+3
| | | | | | | | | now that we have QTREPOS, we can use that directly instead of collecting the QT.<foo>.qml dirs. as a "side effect", this makes qml modules without a corresponding c++ module available to the scan. Change-Id: I6f172121588ec01c9fa47a99d9990bf9fcfbc69f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix quoting and path separators in qtPrepareTool()Oswald Buddenhagen2014-05-232-11/+16
| | | | | | | | | | | | | | | we need to store commands with system path separators in the .pri files, as we might clobber windows command arguments if we just converted separators later on. and we can actually do that, as the path separators are actually bound to the host system, not the shell. we also need to shell-quote the commands, as whitespace, and more commonly windows path separators in an msys shell, would break things. we delay this to the last moment possible, as it does depend on the shell. Change-Id: I1fe6b63aebd5663b72492c32928ec397f86e336f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* WinRT app manifest: update namespace prefixAndrew Knight2014-05-221-9/+9
| | | | | | | | | | If the prefix isn't "m2" for the 2013 namespace, Visual Studio Update 2 won't open the document in the designer view. Even though there is nothing technically wrong with the way it's currently done, change it to "m2" to keep VS happy. Change-Id: I62721114610de5396eb507828b39db89c1e96b1a Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Add build support for Windows Phone 8.1Andrew Knight2014-05-229-15/+190
| | | | | | | | Tweak qmake, add mkspecs for emulator and device, adjust the manifest template for WP8.1, and add missing icons. Change-Id: I7a6405fa85297ae4cc8522015274e65fb7a315a6 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* fix too aggressive installation of helper librariesOswald Buddenhagen2014-05-201-3/+3
| | | | | | | | | | | of course all helper libraries are built statically, so the criterion is not useful. what is interesting is whether the whole qt configuration is static, as that determines what will happen with the helper library when linking the final "actual" artifacts. Change-Id: I96980c645cb478b2f7a30688b49cb51bec8c9f08 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Strip bootstrapped binaries of unused sectionsThiago Macieira2014-05-194-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the -ffunction-sections from bootstrap.pro, which tells the compiler to create a section for each function. The -gc-sections option tells the linker to drop what wasn't used (normally, it only drops entire files). Before (on Linux, built with -O3, no LTO): text data bss dec hex filename 1746385 7920 3750 1758055 1ad367 bin/moc 1444101 6664 1894 1452659 162a73 bin/rcc 4407725 1568 4896 4414189 435aed bin/qmake After: text data bss dec hex filename 1131655 6520 3494 1141669 116ba5 bin/moc 1027043 5480 1766 1034289 fc831 bin/rcc 3578489 1656 5313 3585458 36b5b2 bin/qmake Gain: 35% on moc, 28% on rcc, 19% on qmake Before (on OS X): __TEXT __DATA __OBJC others dec hex 1495040 12288 0 4294993008 4296500336 100176470 bin/moc 1265664 8192 0 4294983904 4296257760 10013b0e0 bin/rcc 5279744 81920 0 4297912320 4303273984 1007ec000 bin/qmake After: __TEXT __DATA __OBJC others dec hex 806912 8192 0 4294988132 4295803236 1000cc164 bin/moc 720896 8192 0 4294979764 4295708852 1000b50b4 bin/rcc 4841472 77824 0 4295580688 4300499984 100546c10 bin/qmake Gain: 46% on moc, 43% on rcc, 8% on qmake. Change-Id: Icc7cdc9fd6f5db15537b4adabaac7e7a27e539d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make the use of -ffunction-sections more generic in QtThiago Macieira2014-05-195-0/+10
| | | | | | | | | | | Move it from bootstrap.pro into qt_module.prf so it will apply to any other bootstrapped libraries, like libQmlDevTools. Variable called "SPLIT_SECTIONS" because -fdata-sections could be added in the future, if it proves to be a benefit. Change-Id: I3fbb004f111620a84e58e9112e9bce3afd95631e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-142-4/+9
|\ | | | | | | Change-Id: If1abbe7810ea43ae750db91066f9f579c79b2289
| * fix doc references to webkitOswald Buddenhagen2014-05-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | we can't derive the doc index paths from QMAKEMODULES, as the mkspecs dir may not live at the repo's top level. instead, explicitly announce the repo's top level build dirs in QTREPOS, and use that accordingly. Task-number: QTBUG-38862 Change-Id: I643ad2bf63c8fca0ffc44ce3457dbe8a16dcab07 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Use the "gcc" feature in simd.prfThiago Macieira2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | Matches the compiler capabilities better and will catch all GCC-like compilers (including Clang, LLVM and Intel CC on Unix). Task-number: QTBUG-38544 Change-Id: I102966d307a4e167b6dcf3da08359e656f3af45e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-032-1/+28
|\ \ | |/ | | | | | | | | | | Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
| * mkspec (iOS): use QTPLUGIN.platforms=-Richard Moe Gustavsen2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | After bbcdccd, a deprecation warning is written to the console every time you run qmake on iOS. This change will make use of the new QTPLUGIN.platforms=- instead if the deprecated CONFIG -= import_qpa_plugin Change-Id: I51e4f9d18f6abd87512a39b3236b89d5444fd6c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * install convenience libraries when building staticallyOswald Buddenhagen2014-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | we don't link static libs into other static libs, so the intermediate libs need to be installed and resolved at app link time. Task-number: QTBUG-32519 Change-Id: I0558140f98a6938b03306df7f800d66f8a19a7cd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * centralize auxiliary lib creationOswald Buddenhagen2014-04-281-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | this covers convenience libraries which are linked into dlls (if we are not building statically) and "proper" (installed) builds of 3rdparty code. Change-Id: I2f00248c0baa0e73346e477724bf49bbc62ba925 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-012-7/+9
|\ \ | |/ | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| * Android: Add "unversioned_libname" configurationEskil Abrahamsen Blomfeldt2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android, there's a limitation set on the names of the libraries you deploy that they must start with "lib" and end with ".so", so Android apps will link against and deploy with the unversioned libQt5FooBar.so libraries. When cross-compiling on Windows however, due to the lack of symbolic links, the only installed library used to be the main library target "libQt5FooBar.so.X.Y.Z" (for version X.Y.Z.) This has been worked around in packaging, but breaks building add-on modules on top of Qt, and is clearly wrong. This patch introduces a new "unversioned_libname" configuration in qmake which is currently only supported for the Unix makefile generator and only enabled for Android builds. When it is enabled, only the unversioned library "libQt5FooBar.so" will be created. Task-number: QTBUG-38347 Change-Id: Ia8897ca7a23a62e2a526d0e02854899b02eb19dc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * deprecate import_qpa_plugin and qpa_minimal_pluginOswald Buddenhagen2014-04-241-6/+8
| | | | | | | | | | | | | | | | they have been fully superseded by 4255ba40ab073afcf2a095b135883612859af4c2. Change-Id: If7ac14c8b7d3cf00fb0cb916036b62eb86c9cee0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>