summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* unbreak tool invocation in prefix builds againOswald Buddenhagen2015-11-061-5/+2
| | | | | | | | | | | | | | | | the statement order was wrong since c23a086e - we can't use MODULE_DEPENDS before we define it. but actually use a bigger cannon and partially revert the patch, to include .depends unconditionally again. the idea is that this should override a possibly included other .pri file from a previous build/install. (the same argument would sort of apply to .envvars as well, but we assume that its presence won't vary between builds.) Change-Id: I95e9743e367a3d1f45d603d1bb5b31c4875f39a2 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-043-3/+15
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
| * Workaround: don't create ELF version scripts for AndroidThiago Macieira2015-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Somehow qmake doesn't add the correct rules for the Android makefiles, so the build fails when cross-compiling from Windows. The reason for that is unknown (could be related to that "qt_android_deps" config, but that isn't used anywhere in qmake or the buildsystem). This isn't likely to be a problem, since there are no global installs of Qt on Android. Change-Id: I1d0f78915b5942aab07cffff140f95ce32324030 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add qgltf support to qmakeAndy Nichols2015-10-262-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | qgltf is a tool provided by the Qt3D module that enables 3D assets to be defined in qmake project files, and have them converted to an efficient binary format at build time. The qmake feature will convert all 3D assets specified by the QT3D_MODELS variable to the qgltf format and add the new model asset to the project as a Qt resource file. Change-Id: If7250d6f23a06254b1ed0e408057723763aad8c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | configure: Separate host and build platform.David Schulz2015-10-302-30/+41
| | | | | | | | | | | | | | | | | | | | This separation makes it possible to make a canadian cross build of Qt on a linux build machine. The canadian cross build requires an external Qt that runs on the build system. Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | QMake: Add option to set qt.conf file.David Schulz2015-10-271-1/+3
| | | | | | | | | | Change-Id: Ie5db11892ccf2d357773a4db6a0464bf27be9a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-2315-20/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
| * Place classes from private headers in the Qt_5_PRIVATE_API ELF versionThiago Macieira2015-10-202-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, it's possible to tell which applications and libraries depend on the Qt private API and of which Qt library. Linux distributions can use this information to decide which applications need to be recompiled every time Qt itself is rebuilt. This is done by scanning all class and struct definitions in the private headers (we've already got the list from syncqt). I opted to add a new script instead of modifying syncqt because then this can run in parallel with the rest of the compilation, as opposed to during qmake time. Another advantage is that it catches modifications to the headers in between qmake executions. Since this is already Unix specific, it should be no problem to use Perl. This solution is limited to use of non-inline symbols of classes declared in private headers. It will not catch free variables (such as qsimd_p.h's qt_cpu_features), use of inlined functions or just plain use of a class/struct for accessing its data members. However, this is already better than nothing and should help Linux distributions quite a lot. And there's no way to catch the latter issue anyway. Change-Id: I049a653beeb5454c9539ffff13e3fff36400ebbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * don't try to use relative rpaths on platforms that don't support itOswald Buddenhagen2015-10-201-1/+1
| | | | | | | | | | Change-Id: I8224d429d71ccc829beb1addf592806d2edaa87b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * support relative paths in QMAKE_RPATHDIROswald Buddenhagen2015-10-203-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and make use of it in qt.prf. [ChangeLog][qmake][Unix] Added support for relative paths in QMAKE_RPATHDIR. Note that this technically breaks backwards compatibility, as relative paths were previously silently resolved against $$_PRO_FILE_PWD_. This was not documented and seems rather useless, so i'm not worried. Change-Id: I855042a8962ab34ad4617899a5b9825af0087f8a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Update qversiontagging.cpp not to use too much assembler magicThiago Macieira2015-10-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only reason I had used them in the first place was because C preprocessor macros cannot call themselves recursively. But the magic was too magic and caused issues with some builds, so let's choose the safer option. Anyway, this solution now works for all ELF architectures, independent of the processor, whereas previously it was restricted to x86 and Linux/ FreeBSD. However, this does not apply to the assembly in qversiontagging.h. Change-Id: I42e7ef1a481840699a8dffff1404f032fc5cacb8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * winrt: Avoid empty <Dependencies> section in manifest filesOliver Wolff2015-10-203-4/+6
| | | | | | | | | | | | | | | | | | | | If that section is there but empty, the manifest cannot be loaded using the App Manifest Designer in Visual Studio. Task-number: QTBUG-48648 Change-Id: I529eb2f2a690bececcf5c385b8f96e84ece363d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * winrt: use correct winapi family defines in mkspecs and system detectionAndrew Knight2015-10-205-5/+5
| | | | | | | | | | | | | | | | WINAPI_FAMILY_APP is deprecated, so use WINAPI_FAMILY_PC_APP instead. Also, open up the phone partition for use on MSVC2015. Change-Id: I7476d71c31395b2914f5a1439e8088341976bf2f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * Turn C++11 on by default if the compiler supports C++11Thiago Macieira2015-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] qmake now enables C++11 support by default if the compiler is known to support it (unless the compiler defaults to C++14 or a later edition). To disable this, add to your .pro file: CONFIG -= c++11. Note that Qt 5.7 will require C++11 support, so it is a good idea to ensure your code works with that compiler setting. (Note: it is not possible to disable C++11 support with Microsoft Visual Studio) Change-Id: Ib056b47dde3341ef9a52ffff13ef13ee2cf888eb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * tools: use QStringBuilderMarc Mutz2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | src/tools/bootstrap was already compiled with QT_USE_STRINGBUILDER, by way of load(qt_module), but the actual apps weren't. Some apps become smaller, some larger; all (presumably) faster. Change-Id: Idc8662e62ec14b27e730de9842bec295a1b5566e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | headersclean: s/QT_USE_FAST_CONCATENATION/QT_USE_QSTRINGBUILDERSérgio Martins2015-10-191-1/+1
| | | | | | | | | | | | | | The former is meaningless nowadays. Change-Id: I27c7eb0e924f3f2e9b73185f1b198909aeb6b031 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Update mkspecs to use "c++11" instead of "c++0x"Thiago Macieira2015-10-184-7/+7
| | | | | | | | | | | | | | | | We no longer support any compilers that don't know the actual version number of the standard. Change-Id: Ib056b47dde3341ef9a52ffff13ef154791dd0d22 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1484-319/+195
|\| | | | | | | | | | | | | | | | | Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
| * Add support for the Jetson TK1 Pro using EGLDeviceLaszlo Agocs2015-10-142-0/+72
| | | | | | | | | | | | | | | | | | | | | | For now we pick one crtc and find the corresponding layer. If this is not desired, set QT_QPA_EGLFS_LAYER_INDEX to override the layer to be used. Enable qt.qpa.eglfs.kms to get logs about the available layers. Change-Id: I762783f960739e32966c8cde17d8f55fbe40091f Done-with: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * Distinguish between Objective-C and Objective-C++ sourcesTor Arne Vestbø2015-10-0915-51/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of lumping both Objective-C (.m) and Objective-C++ (.mm) sources into the same pile, passing them on to the same compiler as for C++ (CXX), with the C++ flags (CXXFLAGS), we follow Apple's lead and treat them as variants of the C and C++ languages separately, so that Objective-C sources are built with CC and with CFLAGS, and Objective-C++ sources with CXX, and CXXFLAGS. This lets us remove a lot of duplicated flags and definitions from the QMAKE_OBJECTIVE_CFLAGS variable, which in 99% of the cases just matched the C++ equivalent. The remaining Objective-C/C++ flags are added to CFLAGS/CXXFLAGS, as the compiler will just ignore them when running in C/C++ mode. This matches Xcode, which also doesn't have a separate build setting for Objective-C/C++ flags. The Makefile qmake generator has been rewritten to support Objective-C/C++ fully, by not assuming that we're just iterating over the C and C++ extensions when dealing with compilation rules, precompiled headers, etc. There's some duplicated logic in this code, as inherent by qmake's already duplicated code paths, but this can be cleaned up when C++11 support is mandatory and we can use lambda functions. Task-number: QTBUG-36575 Change-Id: I4f06576d5f49e939333a2e03d965da54119e5e31 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-10-021-1/+1
| |\
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb
| | | * Windows: Change the mocinclude extension to .optAndy Shaw2015-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cleaning in Visual Studio then it will remove all instances of tmp files which meant it would remove the mocinclude.tmp as well incorrectly. Therefore the extension of the mocinclude file needs to be changed to .opt so that it is left untouched by Visual Studio. Change-Id: Iebc055f33f9dc87a4fa42ae87b253f6739903e8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | remove now superfluous QMAKE_*_VERSION_OVERRIDEsOswald Buddenhagen2015-10-021-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these were necessary to suppress the appending of the qt major version to the library name when reading .prl files. this has outlived its usefulness, as the .prl files now contain the full library name. additionally, the overrides would break the use of qt if the .prl files were not shipped, as zero lost its special meaning as "none". Change-Id: I9f028c17fc0428cb546a4a26ee209febff32da5e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | merge MingwMakefileGenerator::findLibraries() into Win32MakefileGeneratorOswald Buddenhagen2015-10-021-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | as a side effect, this makes the extensions used for searching libraries configurable under windows (QMAKE_LIB_EXTENSIONS). Change-Id: I3e64304fcadbfe74d601b50a70a73180c894503e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Xcode: Set DYLD_IMAGE_SUFFIX=_debug when launching Debug configurationTor Arne Vestbø2015-10-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we pick up the debug version of the Qt libraries in a debug and release build. Change-Id: I7fc1ed72a6f01b138608413954d4b9e45b7782a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
| * | unify handling of library prefixes and extensionsOswald Buddenhagen2015-10-018-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that all specs define QMAKE_{PREFIX,EXTENSION}_{SH,STATIC}LIB, and adjust the code to make halfways consistent use of these variables, in particular on windows; Win32MakefileGenerator::getLibTarget() is gone as a result, as is QMAKE_CYGWIN_SHLIB. still, tons of hardcoded "lib" references remain in the unix generator, because no-one cares. Change-Id: I6ccf37cc562f6584221c94fa27b2834412e4e4ca Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | move inclusions of unix.conf (and related files) near the topOswald Buddenhagen2015-10-0150-52/+102
| | | | | | | | | | | | | | | | | | | | | that way we can override the values defined there. Change-Id: Ib9bce596d9fd43875b26a97c5489ee9d0d46b77c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove references to $$QMAKE_CYGWIN_EXEOswald Buddenhagen2015-10-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | it would cause the unix generator to set TARGET_EXT, but that wasn't used anywhere. so remove the dead code. if it ever gets re-introduced, it will be as QMAKE_EXTENSION_EXE. Change-Id: I44ce3e612651fd229177e37ab6c8879cd8c474b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove unsupported linux-armcc specOswald Buddenhagen2015-10-013-165/+0
| | | | | | | | | | | | | | | | | | | | | | | | it was experimentally added in 2011. there is no evidence that anyone actually uses it. Change-Id: Ie3b131f3783cafe942d180b2623fcc64740d7a73 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | omit trailing /. from relative RPATHs pointing to own directoryOswald Buddenhagen2015-10-011-2/+8
| | | | | | | | | | | | | | | Change-Id: Ia4551f5b16f4e66c7ab7fdec82643d9cd8866ccd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | fix place of "qnx" in $$QMAKE_PLATFORMOswald Buddenhagen2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it must come first, as it is most specific. an alternative fix would be re-organizing the includes, but that requires a lot more effort to get right. Change-Id: I1526a3c966f3dc3f3df1efc00ec271d333ed7ebf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | more accurate check for presence of target INSTALLOswald Buddenhagen2015-10-011-1/+2
| | | | | | | | | | | | | | | | | | | | | make it match qmake's own rules. Change-Id: Ia6b9ac12ac08932ac67f100f4638352a214553bd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Don't include <windows.h> in the MinGW qplatformdefs.hThiago Macieira2015-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for it and there's harm in doing so, as it #defines "interface". Task-number: QTBUG-48351 Change-Id: I4ca855441b899f3f723a12f673645f3ce7541d9b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Fix for platform socklen_t on other C libraries than glibc.Dave Flogeras2015-09-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than treating >=glibc-2 specially, we treat <glibc-2 specially and all other libc implementations as POSIX. This was found here http://patchwork.openembedded.org/patch/94947/ and tested with armv6j-hardfloat-linux-uclibceabi and armv6j-hardfloat-linux-musleabi. Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Remove unused font deployment featureAndrew Knight2015-09-301-62/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is a leftover from the unsupported Windows Phone 8.0 mkspec. Change-Id: Ibcf11e131a3cb098960410dbd683eb5950b0c5ad Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | | configure: Add support for detecting AVX512 instructionsThiago Macieira2015-09-255-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on Linux with Clang 3.7, GCC 4.9, 5.1 and 6.0, ICC 16 beta; on OS X with Clang-XCode 6.4, ICC 16 beta; on Windows with MSVC 2013 and ICC 15. MinGW is not tested. GCC 4.9: AVX512F AVX512ER AVX512CD AVX512PF GCC 5 & 6: AVX512F AVX512ER AVX512CD AVX512PF AVX512DQ AVX512BW AVX512VL AVX512IFMA AVX512VBMI Clang 3.7: AVX512F AVX512ER AVX512CD Clang-XCode: <none> ICC 15 & 16: AVX512F AVX512ER AVX512CD AVX512PF AVX512DQ AVX512BW AVX512VL MSVC 2013: <none> Change-Id: Ib306f8f647014b399b87ffff13f1da1b161c31d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-2543-314/+365
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
| * | Use QMAKE_MOD_LEX/QMAKE_MOD_YACC in lex/yacc featuresAndrew Knight2015-09-242-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | These variables were defined but never used in the respective qmake features. Utilizing them allows more control over the output file name. Change-Id: I5ba96c5cd330b18dc060f563186992fe3bd27b49 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Update the list of compilers we are free of warnings withThiago Macieira2015-09-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | I've tested with Clang 3.7 and ICC 16 on Linux, XCode 6.4 on OS X for OS X (not iOS). Change-Id: Ib306f8f647014b399b87ffff13f1f4291d801a20 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | ICC: Remove the -fno-jump-tables workaround.Thiago Macieira2015-09-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | I added this sometime in the past to work around some ICC bug in position-independent code. Modern versions don't have the bug. Change-Id: I42e7ef1a481840699a8dffff140049ce927cdff2 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | ICC: Update LTCG-related optionsThiago Macieira2015-09-213-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | See https://software.intel.com/node/522852. There are options to turn off LTCG and, on Linux, to enable/disable fat objects. Change-Id: I42e7ef1a481840699a8dffff14003db5a9c95b83 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | Disable annoying ICC warning 809Thiago Macieira2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably emitted in error in ICC 16. warning #809: exception specification for virtual function "QQmlEnginePrivate::~QQmlEnginePrivate" is incompatible with that of overridden function "QObjectData::~QObjectData" Change-Id: I7a21ba10770ba008bdc18f535502376e1d92520f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | inline qtAddModules() and dependenciesOswald Buddenhagen2015-09-172-124/+105
| | | | | | | | | | | | | | | | | | | | | | | | there is no particular reason to have them in qt_functions.prf any more, while the separation made the code harder to follow. Change-Id: Ie44c9784358f382f7bc863b421ff5b440211d66f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | change implementation of deprecated qtAddLibrary() to modify QTOswald Buddenhagen2015-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of invoking qtAddModule() directly. gives better decoupling and unified code paths. Change-Id: I4a456ae3b8027aa65b8a4fba7ee5c171ae89be0c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | inline qtAddRpathLink()Oswald Buddenhagen2015-09-172-18/+13
| | | | | | | | | | | | | | | | | | | | | there is no particular reason to have it in qt_functions.prf. Change-Id: I88ed1ea937a9a88a4625a6de7bcd3a29957560da Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | sanitize qt rpath handling, in particular on macOswald Buddenhagen2015-09-176-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the addition of qt's rpath belongs into qt.prf - even on mac. so consolidate the two implementations. as a nice "side effect", we get relative rpaths also on linux. another "side effect" is that we don't unnecessarily add the qt rpath to qt modules also on linux. the qt rpath addition mechanism should not be responsible for setting the policy who gets a relative rpath, so move the logic to higher-level callers. Change-Id: I52e8fe2e8279e7b1ac25fae758867a5cb1cafcf8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | simplify qt rpath codeOswald Buddenhagen2015-09-173-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | the rpath applies only to the installed on-device location and is consequently always the same for all modules, so there is no point in indirections. Change-Id: Ia0590552aa317d799a2d3879fd0c0768344b9645 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove dead code re QTLIBOswald Buddenhagen2015-09-171-4/+0
| | | | | | | | | | | | | | | | | | | | | this variable is not referenced anywhere else. Change-Id: Ib4d0a47a08d029f65542e752fa2a47c992e061fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove boundschecker exclusion hackOswald Buddenhagen2015-09-171-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | the old plugin loader which test-loaded plugins (without their dependencies) is gone, so the hack is obsolete. Change-Id: I68077cb58174dfbcb0b5372e2574de41f48d35c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:39:01 +0000