summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-05-143-11/+12
|\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt_module_headers.prf tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qwidget/BLACKLIST Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c
| * Fix build of applications on iOSChristoph Keller2018-05-132-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | When QMAKE_TARGET_BUNDLE_PREFIX is set in the .pro file then this value should be used instead of the default value for PRODUCT_BUNDLE_IDENTIFIER. Therefore, PRODUCT_BUNDLE_IDENTIFIER should be set inside default_post.prf so that it can take the value of QMAKE_TARGET_BUNDLE_PREFIX after it may have been set. Task-number: QTBUG-66462 Change-Id: Iec1e2a43632efe6021b9d6bfdb78bd941326c456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-4/+5
| |\ | | | | | | | | | Change-Id: Id6e2acd5e31c1ac858ddf1d8873a6f10694141de
| | * syncqt: fix CamelCase aliases for injected headersOswald Buddenhagen2018-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't put them into GENERATED_HEADER_FILES, as they obviously cannot be found in a pre-synced source dir. instead, let the injection code itself add them to INJECTED_HEADER_FILES. Task-number: QTBUG-67813 Change-Id: Id2a7c565b14fcba8aba9d1dd8b1dd39c586d0d91 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * syncqt: don't write INJECTED_*HEADERSOswald Buddenhagen2018-04-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | these are actually redundant with INJECTIONS. Change-Id: I0a71930401e00d30c9898b4d958de5e89c496d18 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | configure: change convention of passing libraries to config testsOswald Buddenhagen2018-05-081-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of pre-resolving them and passing the final LIBS to qmake, pass raw QMAKE_*_LIBS* assignments and a QMAKE_USE stanza. the immediate benefit of that is that it centralizes the debug/release lib handling, which makes build variant overrides available to all libraries, not just a few selected ones. note that this removes the CONFIG+=build_all from the test projects. turns out that this was ineffective to start with, as config tests are built with an explicit CONFIG-=debug_and_release. we might re-instate it in a non-broken way later on. Change-Id: I2117c5b36937e8230bd571dcee83231515cbe30b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | configure: centralize shell-quoting of tests' .literal_args fieldOswald Buddenhagen2018-05-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | this de-noises the code somewhat, and makes it possible to eval() the code generated by $$qtConfLibraryArgs(), which we want to do later. Change-Id: Ib6101c6745101801e34f8fab1ad6651e624130c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | macOS: Experimental Vulkan support via MoltenVKMorten Johan Sørvig2018-05-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for QSurface::VulkanSurface and QVulkanWindow. Usage: 1) Build MoltenVK according to instructions 2) Configure Qt: ./configure -I /path/to/MoltenVK/Package/Release/MoltenVK/include 3) export QT_VULKAN_LIB=/path/to/MoltenVK/Package/Release/MoltenVK/macOS/libMoltenVK. Implement support for QSurface::VulkanSurface by enabling layer mode for QNSView and then creating a CAMetalLayer, which the MoltenVK translation layer can run on. MoltenVK provides an implementation of the Vulcan API, which means that the platform integration is similar to other platforms: implement a QCocoaVulkanInstance where we pass the QNSView instance to the vkCreateMacOSSurfaceMVK Vulkan surface constructor function. Using Vulkan directly without QVulkanWindow is possible, but not tested. We currently load libMoltenVK at run-time and use the existing QT_VULKAN_LIB environment variable to set its path. For deployment purposes it would be better to link against MoltenVK.frameworkm, but this Task-number: QTBUG-66966 Change-Id: I04ec6289c40b199dca9fed32902b5d2ad4e9c030 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | fix handling of GENERATED_TESTDATA with CONFIG+=builtin_testdataOswald Buddenhagen2018-05-071-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relative paths must be resolved against $$OUT_PWD, not $$_PRO_FILE_PWD_. Task-number: QTBUG-58991 Change-Id: I9ce8e9c78e0fad026a7cc355852d23f9d6e96ee6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | android: Add support for precompiled headersDarrell Walisser2018-05-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Copied lines from common/g++-base.conf to enable support. Task-number: QTBUG-51700 Change-Id: Ia2691cb137cac8b1378c5749892c36f0143570c9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | make it possible to override the basename of module config filesOswald Buddenhagen2018-05-032-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using qt$$MODULE isn't enough if the module is composed of submodules which need the final module's headers, because that would require two modules having the same module .pri file. the first thought to fix this was to just use $$lower($$TARGET), but that breaks for testlib (QtTest). while the config file name isn't public api, it's included by a public header, so changing it is risky. so instead stay with the original pattern, but make it explicitly overrideable. Change-Id: I758c46ed403620620d577ae16866ce751271b63e Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-021-5/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a
| * | Do emit CMake declarations for existing private headersUlf Hermann2018-04-271-5/+5
| |/ | | | | | | | | | | | | | | | | | | We need to make sure we don't emit CMake declarations for private headers if those headers are absent. However, most of the time we have private headers and should add them. Task-number: QTBUG-37417 Change-Id: I639eb93d008de27928dedac540894af70c1883b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Make the use of -fdata-sections and --gc-sections more generic in QtMikhail Svetkin2018-04-277-8/+8
| | | | | | | | | | | | | | | | | | | | Add qmake feature and configure option, which optimze the size of static exectuable. Use for static build. Enabled via configure --gc-binaries, or CONFIG += gc-binaries in 3rd party projects. Change-Id: I3c25b02caaef6a4afc6019afc9c67122dd11696d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Fix build of static plugins with resources with debug-and-releaseSimon Hausmann2018-04-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing out the $TARGET_plugin_resources.cpp file in !build_pass breaks when TARGET is adjusted by $qtPlatformTargetSuffix values. We end up writing out $TARGET_plugin_resources.cpp but the debug Makefile looks for $TARGET_debug_plugin_resources.cpp. Try using the pro file name as name source instead, as suggested by Ossi. Task-number: QTBUG-67931 Change-Id: I221cf9b2ec1db699568d0c73513aa66ecf0ada97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Make it easier to use resources in plugins when using static linkingSimon Hausmann2018-04-231-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RCC generates code that registers resources automatically on program startup via global constructors. When linking statically and nothing references the symbols in the .o file compiled from the RCC generated code, then the linker will discard the embedded resources and they will not get initialized. That is why for static linking it is necessary to explicitly initialize resources using the Q_INIT_RESOURCE macro. We can avoid the need for the explicit initialization in the context of plugins that are statically linked into the application. resources.prf can generate a .cpp file with a helper function that contains all the Q_INIT_RESOURCE calls for all resources in the plugin. That helper function in turn is injected into the plugin entry point, which in turn is guaranteed to be included in the final binary. Change-Id: If1abf9c85ef92935020af073b989c58c1ae6ca63 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Detect C standard and try using the most recent one (take 2)Allan Sandfeld Jensen2018-04-217-2/+35
| | | | | | | | | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-202-7/+6
|\ \ | |/ | | | | Change-Id: I0bea38585382b5d9c8d7a013bf6bcb3a6008d159
| * qmake: fix sdk resolution on macosTim Uy2018-04-181-6/+6
| | | | | | | | | | | | | | | | | | the 'info' variable was re-used too early. make a new one 'infoargs' instead. Task-number: QTBUG-67286 Change-Id: I77881ecbfce338d653358c5e5edac84e1c0c7de3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * iOS: Allow building QML based test casesAndy Shaw2018-04-181-1/+0
| | | | | | | | | | | | | | | | | | | | In order to be able to build and test a testcase on an iOS device it needs to be a bundle. So the app_bundle config should only be removed if the testcase_no_bundle is set. This is already done by testcase.prf. Task-number: QTBUG-45211 Change-Id: I4f16ea832ccff2a5db5fed0050fa0344b4ac9ad6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-183-14/+2
|\ \ | |/ | | | | Change-Id: I86f04fc3b2e4291f161a4985adddd6fd6c789d33
| * Use optimize_size instead of duplicating similar logicAllan Sandfeld Jensen2018-04-143-14/+2
| | | | | | | | | | | | | | | | | | The android mkspecs had their own way of doing the same as optimize_size Change-Id: Id05822df6bdeb8b3aafada2901bd61530c490fe9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devLars Knoll2018-04-123-10/+22
|\ \ | |/ | | | | Change-Id: I9f802cb9b4d9ccba77ca39428a5cb1afd2d01642
| * rework syncqt interaction regarding cross-tree pathsOswald Buddenhagen2018-04-123-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on more or less accidental qmake behaviors regarding the base dir for relative paths (esp. if a file does not exist yet), make everything explicit. to that effect, clearly define the base tree (source or build) for every syncqt-generated variable, and write only in-tree relative paths to the variables. on the receiving end, resolve the paths as soon as headers.pri was read. Task-number: QTBUG-67111 Change-Id: I32ae5760fb62ebc650fdb69e46aac786a8141564 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-113-6/+42
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
| * configure: cache test output as wellOswald Buddenhagen2018-04-102-5/+39
| | | | | | | | | | | | | | | | that way we can create a config.log which is consistent with the end state even if (some) tests are not executed this time around. Change-Id: Ia953ede62d6640aab912559f435ceb1f9ec6d9dc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * don't call qmake's exists() with an empty argumentOswald Buddenhagen2018-04-101-1/+3
| | | | | | | | | | Change-Id: I73330bd1c2de1734c5ac5c668ff9af7e85fc902a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-101-2/+5
|\ \ | |/ | | | | Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
| * macx-clang: Update informal documentation for xcb buildGabriel de Dietrich2018-04-091-2/+5
| | | | | | | | | | | | | | | | | | Remove references to XKB and explain what to do if pkg-config is missing or unwanted. Change-Id: I099bf01ff49e1b8f6e822a50f0fe4904965a7a9f Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qmake: add support for mkspecs which don't support strict_c++Mikhail Svetkin2018-04-052-4/+8
| | | | | | | | | | | | | | | | | | | | Some mkspecs do not support c++ strict mode. We should allow them to build Qt with GNU extenstions. Change-Id: I0d76cf95355b38953e3475773ec5474c856e1370 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qml_module.prf: add 'install_qml_files' configJ-P Nurmi2018-04-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow QML modules to request installing QML files on the file system regardless of whether the QML files are embedded to resources. Qt Quick Controls need both; external QML files, that are prioritized over compiled resources, can be left out from the final deployment package. The desired setup can be configured as follows: CONFIG += install_qml_files builtin_resources qtquickcompiler With this, there is no need to write custom install/copy/qrc rules for QML files. Change-Id: I2ff2974b64efaea341b6ebb4c9fc2612497d7a33 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qml_module.prf: embed qmldir to resources in static builds onlyJ-P Nurmi2018-04-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "import MyModule", the QML engine looks for a qmldir file in $eachImportPath/MyModule. One of the built-in import paths is ":/qt-project.org/imports". This is meant for static "plugins", where the resources and the plugin are already inside the binary image. For dynamic plugins, the qmldir file is what enables the QML engine to find the plugin in the first place, so it makes no sense to embed it inside the plugin's resources. Change-Id: I29f006efb58d91f7e5212c347087535b06e8c637 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-312-2/+3
|\ \ | |/ | | | | Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208
| * Fix debug_and_release builds with CONFIG += qtquickcompilerSimon Hausmann2018-03-292-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | For correct debug/ and release/ suffix substitution and thus avoid concurrent access to generated files, we have to declare the output directory variable used by qtquickcompiler.prf in qtdeclarative here and enable it for substitution. Change-Id: Id8483daffdf1b9990396c55f7bc0d08a2f65cafd Task-number: QTBUG-66675 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-03-282-17/+6
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_mouse.mm src/testlib/testlib.pro Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2
| * Revert "Detect C standard and try using the most recent"Friedemann Kleint2018-03-267-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change causes a crash when compiling the xkbcommon 3rdparty library and compile failures (qtimageformats on Android). This reverts commit a47cb146809e32f43449dcfe9932833c2f0ab987. Task-number: QTBUG-67326 Task-number: QTBUG-67327 Change-Id: I5ddc4eccad699e3eaec535fd6a63d11b0026b42e Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| * Remove CMake code for CMake < 3.1Kevin Funk2018-03-242-17/+6
| | | | | | | | | | | | | | | | | | This removes the following functions from Qt5CoreMacros: - qt5_use_modules(...) Task-number: QTBUG-63519 Change-Id: I59769060a3a93686bf319b558c0ede55755fdb70 Reviewed-by: David Faure <david.faure@kdab.com>
| * Detect C standard and try using the most recentAllan Sandfeld Jensen2018-03-217-2/+37
| | | | | | | | | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-211-2/+2
|\ \ | |/ | | | | Change-Id: I35a6555e3885e489f88aa9b4b0142e1017f7a959
| * Fix CONFIG+=qtquickcompiler and immediate resources with shadow buildsSimon Hausmann2018-03-201-2/+2
| | | | | | | | | | | | | | | | | | Generated files should be added to RESOURCES with an absolute path. Task-number: QTBUG-67011 Change-Id: Ief82b576824df9abd0901970f076e30dfe57b7d0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | macOS: Explicitly link to debug version of framework when neededTor Arne Vestbø2018-03-161-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configured for both debug and release, and frameworks are enabled, we produce two dynamic libraries inside each framework, eg: QtCore.framework/QtCore QtCore.framework/QtCore_debug When building an executable against these frameworks, we pass -framework QtCore, and the resulting executable will have its LC_LOAD_DYLIB load commands pointing to e.g.: @rpath/QtCore.framework/Versions/5/QtCore When running the executable, the dynamic loader will load the dynamic library dependencies based on these load commands. By setting the DYLD_IMAGE_SUFFIX environment variable at runtime to '_debug', the dynamic loader will prefer the debug versions of each library inside the frameworks. Unfortunately the use of an environment variable to choose debug or release versions leaves room for mismatches between the executable and the libraries that are loaded. An executable built in debug mode will at runtime pick up the release versions of the Qt libraries unless the DYLD_IMAGE_SUFFIX has also been set to match the build configuration of the executable. This results in confusing situations such as building your application in debug mode, and then stepping into Qt code but not getting any symbols. Qt Creator has an option to run the application with DYLD_IMAGE_SUFFIX set, but this is not enabled by default due to the startup cost of loading the Qt debug libraries. More critically, it results in tests failing when the tests are using QTest::ignoreMessage to ignore warnings produced by Qt, and these calls are ifdefed (correctly) inside QT_NO_DEBUG, as the test (built in debug mode) will then expect warnings from Qt, but those warnings are not emittet, as the test is run against the release version of the Qt libraries. To mitigate this mismatch, we now link the Qt frameworks using an explicit suffix, just like we would for no-framework builds on macOS, for debug and release builds on Windows, and for normal builds on other Unixes, leaving the dependency chain for the application predictable: @rpath/QtCore.framework/Versions/5/QtCore_debug This also conceptually matches how Xcode builds applications and frameworks, where it never relies on DYLD_IMAGE_SUFFIX, and instead uses two separate build directories, one for each configuration. The change means that Qt Creator will always load the Qt debug libraries if the application is built in debug mode. For Qt development this is a good thing, as you expect to be able to step into Qt code. For our users, the added startup cost can be mitigated by shipping our binary packages as release-only, but with separate debug info enabled. Change-Id: Ib9f1f2dab90ed00b9fb011200e3a69c71955e399 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | macOS: Allow tests to mark themselves as not supporting high-DPITor Arne Vestbø2018-03-142-0/+20
| | | | | | | | | | | | | | | | | | Some tests are not written to handle running on a retina screen, resulting in additional test failures when trying to fix a CI test failure on a local retina-enabled machine. Change-Id: I0fed33c38792b686ac83abba2bfbc45623382200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-081-1/+1
|\ \ | |/ | | | | Change-Id: Idf471ca5c6cf211813466b539ce45bdc1ae9b97c
| * Apple: resolve SDK version of QMAKE_LINK_C and QMAKE_LINK_C_SHLIBMarcus Calhoun-Lopez2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | On Apple OSes, both compilers and linkers are given an absolute path. For consistency, the same should be done with the C linkers. The change is also a convenience to the MacPorts project, which actively discourages ambiguous compiler names. (https://trac.macports.org/wiki/UsingTheRightCompiler). Change-Id: Ic1885aed825340696e9fde766788eebf51de3ff6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-072-2/+2
|\ \ | |/ | | | | Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
| * Android: add option `-mstackrealign` to clang-x86 mkspecVyacheslav Koscheev2018-03-061-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-66770 Change-Id: I5e8ced0fa60c67d7908f21e5c486fea0d7a50004 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADPKimmo Ollila2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be compatible with latest Qualcomm BSP releases. This patch also makes it possible to select HW layer via QT_OPENWFD_CLIENT_ID and QT_OPENWFD_PIPELINE_ID environment variables. Change-Id: Ie795b21afc61a1de7c1d0b52cdb30a754e3f8266 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 00f693d3e5046999270c92731e34a3e7fcd01c6b) Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Turn on more warnings for Objective-C code on Apple platformsJake Petroules2018-03-051-9/+19
|/ | | | | | Change-Id: I7d5f211e2441415134c5905b159b41dc3b2b231b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: introduce 'subarch' term to expression evaluatorOswald Buddenhagen2018-02-221-0/+6
| | | | | | | | | | | ... and make use of it. it's a logical continuation of the 'arch' term, and will be used also in qt3d's configure. Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I940917d6763842499b18fffd1514c96889a0cc63 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* unify windows mkspecs: define c++ flags explicitlyAlexander Shevchenko2018-02-224-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | with 40e87491 merged, 'QMAKE_CXXFLAGS' variable in 'win32-g++' toolchain became defined via 'QMAKE_CFLAGS'. the similar can be found in 'win32-clang-msvc' and 'win32-icc' toolchains too. this works for now, because such definitions just duplicates code from includes, like 'gcc-base.conf', 'msvc-desktop.conf', etc. but it would became broken, if changes would be applied to 'QMAKE_CXXFLAGS' definitions in that includes, prior to the redefinitions in 'win32-*/qmake.conf' toolchains. thus 'QMAKE_CXXFLAGS' definitions in 'win32-*/qmake.conf' toolchains should not depend on 'QMAKE_CFLAGS' and be done explicitly. in order to apply this change correctly to 'win32-icc' toolchain, its 'QMAKE_CFLAGS' variable should become dependent on definitions in the includes, similar to 'win32-clang-msvc' and 'win32-msvc' toolchains. Change-Id: I5e820e44a769a590ba63f70dcb3a115311093311 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>