summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Don't show QMAKE_INTERNAL_INCLUDED_FILES from Qt (prf/pri)Tor Arne Vestbø2014-07-301-2/+11
| | | | | | | | | | | | | | We build "Supporting Files" out of QMAKE_INTERNAL_INCLUDED_FILES, which is really not supposed to be exposed to the user like that, but since the variable will hold user-included pri files eg., the Xcode generator piggy-backs on this variable to list the files. To make the project view in Xcode a bit cleaner we explicitly exclude any file living inside the Qt directory, meaning we won't show all the pri and prf files from Qt's mkspecs directory anymore. Change-Id: I828700aceac5fdf3ea2b27d9ba3885543c2ad137 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* remove FORMS3 support from VS project generatorJoerg Bornemann2014-07-301-4/+0
| | | | | Change-Id: I3b2ce386a66c9635e62d1a729c75284d223c3423 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless 'group' parameterOswald Buddenhagen2014-07-301-4/+4
| | | | | | | the c'tor always determines the group itself anyway. Change-Id: Ia8f1e747aaefdab164beae34851aa99cec9b790a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Correct the list of files included in "make dist"Thiago Macieira2014-07-303-1/+6
| | | | | | | | | | | | At the very least, include the files named in the sources, like HEADERS. It was quite surprising to send a tarball that included the .pro file and the .cpp sources, but none of the headers. On the other hand, the .qmake.cache file need need not be sent either, despite being include()d in qmake's processing. Change-Id: I8f48ca3e8040f954f321f4643b01c0f36aafe2d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't compile the xcode generator on WindowsJoerg Bornemann2014-07-291-0/+4
| | | | | | | | With MSVC it takes minutes to compile pbuilder_pbx.cpp. So let's remove this generator that's never used. Change-Id: I13038d551283d96dfb0baf0b8a8a68c6538193c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix qmake warning about unknown /Zc:strictStrings optionJoerg Bornemann2014-07-241-0/+2
| | | | | | | | Make /Zc:strictStrings known to qmake's MSVC compiler option parser. Change-Id: I5a4494096fc1d67c96c6de52bb0f1e94eff46136 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Xcode: Fix QMAKE_PRE_LINK dependency handlingTor Arne Vestbø2014-07-231-3/+3
| | | | | | | | | | | Depending on *.o in the Xcode output dir did not actually result in a proper dependency. In Xcode5 this didn't matter much, as the effect was that the build phase was run every time, but in Xcode6 the phase was skipped. We now depend on the object directory itself, which will get its modification time updated to match any rebuilt object files. Change-Id: I8fa6f06c9008c4ce8f7fde7706057ce101bb5727 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-056-27/+40
|\ | | | | | | | | | | | | | | | | | | 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
| * install pdb files also for static librariesOswald Buddenhagen2014-06-051-4/+1
| | | | | | | | | | | | | | | | | | | | the condition is now consistent with that of the target itself (which means that by setting target.CONFIG=no_dll one can actually suppress installing the target itself even if it's not a dll, but anyway). Task-number: QTBUG-39253 Change-Id: Id4684a550a33b463594ab537eaa9e1cbfb61e4ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Remove the need for the dot in OS X/iOS bundle prefixSamuel Gaist2014-05-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the need for the user to put a dot at the end of the bundle prefix which makes it's use more consistent and intuitive. The prefix is based on what Xcode calls the "Company Identifier", basically "com.digia" plus the product name. Changing that to "com.digia.prefix-" and the product name to "Foo" results in a bundle identifier of "com.digia.prefix-.Foo" which is in line with Xcode. Change-Id: I9b62fc4dee1df51b523ce890a8896ea58ea2c62d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Add build support for Windows Phone 8.1Andrew Knight2014-05-225-21/+35
| | | | | | | | | | | | | | | | 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>
* | qmake: generate make dist target for subdir projectsJ-P Nurmi2014-06-023-29/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | The original dist target no longer copies files around, but merely does the final packaging. It depends on a new recursive distdir target, which handles copying distfiles to the distdir. [ChangeLog][Tools][qmake] Added 'make dist' target for subdirs projects (unix only) Task-number: QTBUG-21910 Change-Id: Ib59139c3fe196caf832d8dcefab484ab91f1f5ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix QMAKE_EXTRA_COMPILERS' depend_command being ignoredGiuseppe D'Angelo2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | A typo caused qmake to stop output dependency information added by the depend_command clause. Task-number: QTBUG-13334 Change-Id: I00fabc87438ce94e80341e6f88aa2e0eaab57e19 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | qmake: share the default variablesJ-P Nurmi2014-05-273-28/+23
| | | | | | | | | | | | | | | | | | Eliminate duplicate code => collect the default variables to MakefileGenerator::writeDefaultVariables(). Task-number: QTBUG-21910 Change-Id: Ia03ce0240dd9a101ad9d35db636cd88f38a49320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-05-222-8/+10
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-8/+10
| |\| | | | | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| | * xcode generator: don't modify or copy QMAKE_INFO_PLISTRichard Moe Gustavsen2014-05-212-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the project has a custom Info.plist assigned to QMAKE_INFO_PLIST, we should leave it as-is without scanning and replacing contents inside it. Since we always copy the file to the build folder at qmake time, any later attempts to modify the source file will not have any effect. A better solution is to just reference the custom plist directly from the Xcode, without modifying it. This change will also stop unixmake2 from assigning the default plist to QMAKE_INFO_PLIST, since we need to know in the xcode generator if the variable was set in the project or not. Task-number: QTBUG-38260 Change-Id: I3c488b2960170c544d94f9db89d3ca95ee290bdd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Xcode: Make QMAKE_BUNDLE_DATA always copy files relative to root of bundleTor Arne Vestbø2014-05-221-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of sometimes ending up inside Content/Resources. The two build phases PBXCopyFilesBuildPhase and PBXResourcesBuildPhase have different semantics of where to place the files. For the former we use the root of the bundle as the destination, and this is how QMAKE_BUNDLE_DATA is documented and used, as well as how unixmake2.cpp implements it. The latter on the other hand, always ends up in the resources subdirectory on OSX. Task-number: QTBUG-35318 Change-Id: I45bbd0dfe7ea78ae330ecb0c91efa74e1c76c9eb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | Xcode: Make sure we add a PBXBuildFile entry for ICONTor Arne Vestbø2014-05-221-2/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The ICON qmake variable is implemented in the Xcode generator through the ProjectBuilderSources::files() function, where we append the icon to SOURCES (for some reason). This means we can't exclude non-object sources when writing out PBXBuildFile entries, as the icon file entry is referenced later on in the bundle resources phase. This is a partial revert of 66f6e5b162 which introduced the broken logic. Change-Id: I120d2325165a1eefd3961a9162e9e5eb3a576c36 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | remove unused macro definitionJoerg Bornemann2014-05-131-5/+0
| | | | | | | | | | Change-Id: Ic2451dd7ae352b9e515c52c20a43495066fb72c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-05-131-1/+1
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
| | * Xcode generator: resolve QMAKE_BUNDLE_RESOURCES from project sourceRichard Moe Gustavsen2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A pro file that adds files to QMAKE_BUNDLE_DATA using relative paths will fail building if doing shadow builds. The reason is that we look for the files inside the build dir. This change will make sure we resolve files from the source dir when not using full paths. Task-number: QTBUG-37054 Change-Id: Ic1067861097b3b6a640ee862472d728d6188576a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | remove automagic command path fixing misfeatureJoerg Bornemann2014-05-121-52/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmake tried to extract the actual executable part of an extra compiler's commands and depend_command value and then "fix" it by replacing the directory separators in it with their local versions and calling QDir::cleanPath on it. This misfeature was implemented incompletely and led to unexpected results (see the numerous attempts to fix QTBUG-16372). The user is responsible for passing a correct command by calling the shell_quote or shell_escape functions if necessary. Change-Id: Ic4bfe9eeb697775cd99c865e7a9d335e63605dea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-065-55/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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-013-27/+51
| |\ | | | | | | | | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| | * Fix vcxproj generation on Windows PhoneAndrew Knight2014-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f412f2b5 refactored the platform tool set retrieval, but made the call too early to choose the right tool set on Windows Phone. This fixes the call so that it does not depend on the WinPhone member variable, and also makes it forward-compatible with Windows Phone 8.1. Task-number: QTBUG-38516 Change-Id: Ide91563f5c7f909c4d1a258adc29af6c94595dc9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Android: Add "unversioned_libname" configurationEskil Abrahamsen Blomfeldt2014-04-252-25/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | remove pointless checks for "." and ".."Joerg Bornemann2014-04-291-6/+3
| | | | | | | | | | | | | | | Change-Id: Id2b1353a73012461c594319f9d1341bccef85ecc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | make use of QDir::NoDotAndDotDotJoerg Bornemann2014-04-292-16/+12
| | | | | | | | | | | | | | | Change-Id: Ib4bdc0d4051fed25dec7dc030658b4d0822a37bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | fix default QMAKE_PKGCONFIG_LIBDIROswald Buddenhagen2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | it needs neither native separators, nor a trailing separator. the QMAKE_PKGCONFIG_INCDIR default was already ok. Change-Id: I1048b3870fd3ca09aa76b41aecda7d90402aa64a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | don't emit -L/-F/-I with system dirs to .pc filesOswald Buddenhagen2014-04-151-5/+11
| |/ | | | | | | | | | | Change-Id: Idecb6f8ba61872c23856a8c7e22305c01c67f0b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-117-30/+41
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
| * in command line args, escape tabs as wellOswald Buddenhagen2014-04-072-2/+3
| | | | | | | | | | | | Task-number: QTBUG-27154 Change-Id: I4a204b2bf2231027db55a444f304190c3b30878c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Don't fileFixify PRECOMPILED_HEADER twiceThiago Macieira2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | fileFixify must not be called twice on the same file path, since it will convert an absolute path from the shadow build to an absolute path in the source dir. The first fileFixify occurs in MakefileGenerator::init, along with the fixifying of INCLUDEPATH. Change-Id: I607870573a80eaf834ea5f540bbe1451ec983114 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * vcxproj generator: append version suffix only to library targetsJoerg Bornemann2014-04-031-1/+3
| | | | | | | | | | | | Task-number: QTBUG-38066 Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Windows XP target support for MSVC >= 2012Joerg Bornemann2014-04-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To enable windows xp support, we must do two things: 1. linker flag must be /SUBSYSTEM:CONSOLE,5.01 or /SUBSYSTEM:WINDOWS,5.01. For x64, the version is 5.02. 2. Do not use Windows Kit 8. Win SDK v7.1A is recommended. Prepend the right include paths and lib paths to INCLUDE and LIB before building. The Windows XP target support is enabled by passing "-target xp" to configure. Task-number: QTBUG-29939 Change-Id: I84c8439606cc2a9d27d64947702846faa4f1e4a2 Reviewed-by: Lucas Wang <wbsecg1@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * move platform toolset retrieval to VcprojGeneratorJoerg Bornemann2014-04-035-26/+28
| | | | | | | | | | | | | | | | In a subsequent commit we will need access to more information of the project object. This is merely a refactoring. Change-Id: I40e501d037eb7d0295e1057e7b86e404e88e6ca3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Iikka Eklund2014-04-021-1/+1
|\| | | | | | | refs/staging/dev
| * qmake: change a linker option in .pc file from -llibhoge to -lhogeTasuku Suzuki2014-03-261-1/+1
| | | | | | | | | | Change-Id: Ib4d01bf190eec753f1b5e37e8e5871514e43ac71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | qmake: use the manifest embedding feature of the MSVC linkerJoerg Bornemann2014-04-012-6/+23
|/ | | | | | | | | | | | Since VS 2012 the linker supports the /MANIFEST:embed option, which can be used to embed the automatically generated manifest without calling mt.exe. Using this feature simplifies our generated makefiles, esp. in the case of incremental linking. Task-number: QTBUG-37363 Change-Id: I2c2d8d2abf36c1b9e7b41bc15244344aab8f5b6e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Windows: Support .pdb file names with spaces.Sérgio Martins2014-03-141-2/+3
| | | | | | | | Task-number: QTBUG-3314 Change-Id: I50a8739f134644e3561f1f7e2e04dac469da38b6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Honor the value of the PlatformToolset environment variable.Mat Sutcliffe2014-02-281-0/+10
| | | | | | | | | | | | | | | | The Windows SDK 7.1 command prompt sets this value to "WindowsSDK7.1" through its SetEnv.cmd batch script. The MSVC Express Editions do not include a 64bit compiler toolchain, but the Windows SDK does, so this change makes it easier to build qmake projects for x86_64 when using the Express Editions, by running qmake from the SDK command prompt. See also: http://msdn.microsoft.com/en-us/library/9yb4317s%28v=vs.100%29.aspx http://msdn.microsoft.com/en-us/library/ff660764%28v=vs.100%29.aspx Task-number: QTBUG-31185 Change-Id: I49d3e159ed67f64490a3d57c5471d540d76ae13f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix Windows RT build in amd64 host shellJoerg Bornemann2014-02-251-1/+5
| | | | | | | | | | When running a amd64 VS shell we must not call the x86_amd64 cross-compiler, because it won't be able to start. Instead we're calling the native amd64 compiler now. Change-Id: I6968cde3b24c1938b6e0d82f513e49724455f3cc Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Use QMAKE_TARGET_BUNDLE_PREFIX to build bundle identifierSamuel Gaist2014-02-191-1/+4
| | | | | | | | | | | | | Currently the bundle identifier is build using com.yourcompany + QMAKE_BUNDLE. This patch adds the handling of QMAKE_TARGET_BUNDLE_PREFIX to build the bundle prefix. Task-number: QTBUG-19006 Change-Id: I014279da6dbef393b0df36f6d4995e40ab105316 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-171-0/+5
|\ | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
| * fix warning when generating VS 2013 projectJoerg Bornemann2014-02-121-0/+5
| | | | | | | | | | | | | | | | | | | | /FS forces the compiler to synchronize pdb file writes. This option is not needed when building with Visual Studio itself. Still, qmake needs to know it when parsing the compiler flags. Task-number: QTBUG-36535 Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | WinRT qmake vcproj: Fix icon locatorAndrew Knight2014-02-111-1/+1
| | | | | | | | | | | | | | | | This was broken for shadow builds. Adding the output directory to the manifest file name fixes the problem. Change-Id: I9e5b47a08f80f7afcfd76e13784fbaec912e50ad Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-113-4/+22
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-073-4/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e