summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix building of the C++11 config.test on Windows with ICLThiago Macieira2014-06-271-0/+1
| | | | | | | | | | | | | | | | | | The Intel compiler does support C++11 options on the command-line. configure.exe will correctly try to run it, but the test would fail for incorrect reasons. First, we need to pass the option -Qstd=c++11 to enable it. Second, on Windows, the GCC experimental define isn't defined, nor is __cplusplus updated yet. So we have to rely on the Intel-specific macro. Third, we need CONFIG += console so that the application succeeds in linking against a main() function, as opposed to a WinMain one. Change-Id: I8f3252189df4f8854a9d9aa2cd919c288d2df420 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update the macx-icc mkspec for ICC 15Thiago Macieira2014-06-271-7/+7
| | | | | | | | The -xXXXX options are deprecated, so use the GCC-style -mXXX options. Change-Id: I235c73c4a170003b5b5e20bd4c4c7125107f7f82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable automatic use of pch for MinGWKai Koehne2014-06-261-1/+6
| | | | | | | | | Revert cb09e1e88944e1ab9b0d0 for MinGW. gcc on Windows reproducably crashes when the pre-compiled header becomes big enough ... Change-Id: Icd5a3dfbe59f5ff5c78832e7b4436d0f1cfa1031 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* winrt: Remove WP8.0 references from package manifest featureAndrew Knight2014-06-251-33/+8
| | | | | | | Also, harmonize the qmake documentation. Change-Id: I8722370f86982e33ccf97f631ae257c4c46cade2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* qmake: Guard module depends with __cplusplusHolger Hans Peter Freyther2014-06-201-0/+2
| | | | | | | | | | | | When qtbase has been compiled with PCH and trying to compile the disassembler in QtDeclarative creating the PCH for "C" is failing due the C++ includes. Guard the includes with __cplusplus to be "usable" on C code. This guard is proposed for the "stable.h" in the qmake precompiledheaders documentation. Change-Id: I7a8fb9e59c666a2e1535d988fd71c5cd67d0587d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵J-P Nurmi2014-06-0720-63/+278
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-0520-63/+278
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| | * 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>
* | | Make RCC handle bigger binarieshjk2014-06-061-5/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Traditionally, RCC in "C mode" was meant to bundle small resources into a binary, like help texts or an occasional icon. RCC produces a .cpp file containing the actual data in a char array which is then passed to the compiler and linker as a normal source file. Larger resources should be compiled in RCC's binary mode and loaded at run time. Current Qt Quick use tries to deploy large hunks of data in "C mode", causing heavy compiler/system load. This patch works around the issue by splitting the process into three parts: 1. Create a C++ skeleton, as usual, but use a placeholder array with "easily compilable" (mostly NULs) data instead. 2. Compile the skeleton file. 3. Replace the placeholder data with the real binary data. time (qmake5 ; make clean ; make) takes 1.3 s real time for a 100 MB resource here, and there is still room for improving patching performance if really needed. Change-Id: I10a1645fd86a95a7d5663c89e19b05cb3b43ed1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Expose "android-extra-plugins" androiddeployqt feature to qmakeAleix Pol2014-06-051-1/+5
| | | | | | | | | | | | | | | | | | Makes it possible to use "android-extra-plugins" from qmake through the ANDROID_EXTRA_PLUGINS variable. Change-Id: I7c67e9f104e5397e094afff730efccb91949caa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | RCC: Remove support for CONFIG += resource_combinehjk2014-05-271-14/+3
| | | | | | | | | | | | | | | | We don't use it and it was never documented. Search engine hits only point to this occurrence in the Qt sources. Change-Id: I2dd7adc5438893560daf01ac85620d9f9c028982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Automatically enable precompiled headers for Qt modulesThiago Macieira2014-05-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll use the master depends header for the module as the precompilation header. We could use the master include, but tests show that precompilation benefits taper off for big precompiled headers. The important part is to get the Standard Library headers precompiled. Each module can still override which header to precompile by setting PRECOMPILED_HEADER after load(qt_modules). It can also turn off precompiled headers by setting that to empty or by CONFIG -= precompile_header. Testing a few build times shows the following improvements (GCC 4.8 with -O3 and C++11): QtPrintSupport: 14.7% QtOpenGL: 22.7% QtDBus: 29.5% QtSvg: -2.4% QtXmlPatterns: 26.1% QtQml: 21.6% QtQuick: 25.0% QtMultimedia: 9.0% QtSerialPort: -30.0% QtHelp: 5.6% The numbers also show that precompilation is worse for small modules. Change-Id: I3793fafcedaff5456527cd6b3777ffd162975c36 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix linking warnings on OS X with qmlimportscannerSimon Hausmann2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The linker complains that some symbols were compiled with different visibility settings when linking host_build tools such as the import scanner. As it turns out, we do CONFIG += hide_symbols for static libraries (such as bootstrap or qmldevtools) but naturally not for the final program source code. It appears symbol visibility is not of importance for static libraries in host builds (as opposed to static libraries later linked into shared libraries), therefore this patch removes that. Change-Id: I237a2d8669374eb059dc91b5378f6e3ec93d67a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-2211-7/+28
|\| | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| * 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>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-133-2/+29
|\| | | | | | | | | | | | | | | | | | | | Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
| * | 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/stable' into devFrederik Gladhorn2014-05-0621-78/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
| * | 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>
| * | make QMAKE_DIRLIST_SEP consistent with QMAKE_DIR_SEPOswald Buddenhagen2014-04-303-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that is, make it match the shell used by the make command. this is unlike DIRLIST_SEPARATOR and DIR_SEPARATOR, which always match the actual system shell. Change-Id: I0fb277d75b32be029808623a3b77e1358c4e265e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | untangle use of system vs. shell path(-list) semanticsOswald Buddenhagen2014-04-306-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "system" refers to the system's native shell, which is what qmake's system() invokes, and whose convention by far most commands invoked from a makefile will need. "shell" refers to the shell invoked by make, which diverges from the system shell only when qmake/mingw32-make is called from an msys shell. its conventions need to be used for anything the shell itself does (e.g., assembling env variables, but also command line argument unquoting) and the commands the mkspec sets according to the shell (e.g., QMAKE_MOVE). Change-Id: I0000aa9417c199cf8a810619d31ded24bb0675f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | fix qtmain's .prl file not being usedOswald Buddenhagen2014-04-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at some point we stopped adding the qtmain's library path before its respective -l flag, which lead to qmake being unable to resolve the library location and thus ignoring its prl file. Change-Id: I390a31f8ac2877d3823dfd2787b2cc8c696b0ec0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | don't create a trailing space when PLUGIN_EXTENDS is emptyOswald Buddenhagen2014-04-301-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia6a11721419e043bc08e38b5e6c6dfd71315eca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | fix list of cached module variablesOswald Buddenhagen2014-04-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | makes configure -fully-process less broken. Change-Id: I7d22898b1e6994eb46359afca3fc4ad08e334946 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
| * | Windows Phone: add language control to the package manifestAndrew Knight2014-04-302-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the developer to provide a list of languages to the manifest by listing them in WINRT_MANIFEST.languages. It also allows setting the default language with WINRT_MANIFEST.default_language. Task-number: QTBUG-38557 Change-Id: I5cb94c9f45146e3068d0833b9e669dc17dca14b2 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * | winphone: Fixed font deployment for Visual Studio projectsOliver Wolff2014-04-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of collecting all files from the "fonts" directory to deploy them to the phone, we only collect files which are mentioned in the FONTS variable. Otherwise fonts that were copied to the fonts directory earlier (due to FONTS being unset (default fonts) or set to another set of fonts) will also be deployed as part of the project. Change-Id: I24c77e154a9f2ec75e88d487c056b0be46e17e87 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 07:58:05 +0000