summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-112-0/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-071-0/+4
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp Change-Id: Ib6dd965a7eb6f59103e276b3407739147ecd37b2
| | * qmake: set COPY_PHASE_STRIP to NO in Xcode generatorJake Petroules2018-01-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Xcode 6.3, this must be set to NO because stripping on copy is no longer fully supported due to the potential of input binaries being code signed. In this case Xcode will simply ignore the strip step and issue a warning since stripping would invalidate the code signature. This change silences that annoying warning for release builds. Also, the setting assignment is moved from being hardcoded in the generator, to a QMAKE_MAC_XCODE_SETTINGS value. Change-Id: If25511edddc12b7b0407e2992d80884b7d6437dc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * | Rewrite the Info.plist variable replacement handlingJake Petroules2018-01-061-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the same set of variables can be successfully replaced in both the Makefile and Xcode generators. It also switches the default templates to use the Xcode-style ${var} syntax instead of the @var@ syntax for better Info.plist compatibility across generators. Change-Id: Iff330bafd152773aafac9143c4a34e34f92f0ce6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLars Knoll2018-01-027-38/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-12-306-28/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
| | * Fix an issue causing asset catalogs to be miscompiled with iOS simulatorJake Petroules2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works around the inability to build iOS apps for a "generic" simulator by explicitly setting the Xcode build setting ENABLE_ONLY_ACTIVE_RESOURCES to NO in order to ensure that all variants of assets in an asset catalog are built when targeting iOS simulator devices. Otherwise, we will simply build for whatever the first simulator in the list happens to be. If the application is then deployed to a different simulator, some of the assets needed for that device variant may be missing. This "helps" QTCREATORBUG-19447 but is not a workaround since this fix is necessary for command line builds anyways, even though it's unlikely to crop up in practice there, since one would have to manually deploy the built application bundle to the simulator using simctl rather than going through Xcode (which would rebuild for the appropriate device). Change-Id: Ia41c48dcc715fe79a2c50db66a0ca7a1fea159c2 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * configure: during early setup, skip all of default_pre.prfOswald Buddenhagen2017-12-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of only toolchain.prf. the license check could go haywire, and everything else that file does is meaningless in configure context anyway. Task-number: QTBUG-63452 Change-Id: I5e31c87fe717fda40978c0317556070637e537e2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * qmake: print compiler output if detection phase failsOswald Buddenhagen2017-12-141-5/+11
| | | | | | | | | | | | | | | | | | | | | helps enormously with debugging. Change-Id: Ic8876e74a4dbb14006d8b48658eb141a3f0e0fbf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * unbreak plugin dependency trackingOswald Buddenhagen2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | use the correct operator. amends 623b191c10. Change-Id: Ice8b2a82b1c7828587cccc7d464f9313e176d536 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * configure: make cached results immediately availableOswald Buddenhagen2017-12-141-1/+6
| | | | | | | | | | | | | | | | | | | | | otherwise test de-duplication between modules doesn't work. Change-Id: I2c6222d853108df223758aa8907dc8d004efd87f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * configure: support discarding selected test results with -recheckOswald Buddenhagen2017-12-142-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | especially during debugging, it is often necessary to re-run only one (or a few) tests, where -recheck-all would be wasteful. Task-number: QTBUG-64059 Change-Id: I9410894dec4289ff832d7f75e04f9b60fe76c57c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * configure: reset *_LIBS when *_LIBS_{DEBUG|RELEASE} are specifiedOswald Buddenhagen2017-11-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it could be somewhat surprising that specifying variant-specific libs would not clear the common libs, so do that. of course, the default for the common libs could theoretically contain common deps of the variant-specific libs, in which case clearing them would be surprising in turn - luckily, we have no such case. Change-Id: Ifca08b9e1949c6a0cefed6931ade4021927d7c90 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * configure: make *_LIBS_{DEBUG|RELEASE} always workOswald Buddenhagen2017-11-301-4/+8
| | | | | | | | | | | | | | | | | | | | | ... and not only when the source explicitly specifies build variants. Change-Id: Iac6c8fda8f431d5fb50fada8338d1b660ab040d7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * configure: fix over-quoting in library exportingOswald Buddenhagen2017-11-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike for the other fields, we forgot to eval() the values of the build-specific library values, leading to over-quoting of values which require any quoting at all. amends c0cc50520. Task-number: QTBUG-62521 Change-Id: I4dfce31040dd09248d3f9dd4294f7fb147c13bdd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * configure: fix processing of *_LIBS_{DEBUG|RELEASE}= argsOswald Buddenhagen2017-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtConfLibrary_inline() used to set $${1}.builds.$${b}.libs, while everything else assumed no such .libs suffix. fix the former. amends 9172143f52. Task-number: QTBUG-61431 Started-by: Konstantin Ritt <ritt.ks@gmail.com> Change-Id: I0bd81591c46266d81baa9c12315411183bbc7a63 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Fix macOS shadow prefix builds using pre-synced source packagesAlexandru Croitor2017-11-221-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For source packages that don't have a .git subdirectory, syncqt is executed before configure, with outdir set to srcdir, and this caused path misalignments for injected headers in qt_module.prf when generating makefile rules. The fix is to change syncqt to always output injected header paths relative to the source dir. Task-number: QTBUG-64539 Change-Id: Ia2296e44494093dbf124729062f430ad6fca7262 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Generate gdb indexing for faster debugging on LinuxAllan Sandfeld Jensen2017-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | If the linker supports it, add the gdb index to the debug symbols, which makes loading gdb on Qt libraries much faster. Change-Id: I2ed201c22913b97ac2efaefb5e31636e795ae102 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Pass the include paths to qdocOlivier Goffart2017-12-081-3/+3
| | | | | | | | | | | | | | | Change-Id: Id97df15863e8499d879079b0df705c78c04ca521 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-236-25/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9
| * | qmake: properly filter simulator devices by minimum deployment targetJake Petroules2017-11-154-23/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where a build error may be introduced by a simulator being selected whose OS version is lower than the application's minimum deployment target. Task-number: QTBUG-64456 Change-Id: Ic7c834a1473c183ebb910bc01a416fe1e23a5a14 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * | Fix shadow prefix framework buildsAlexandru Croitor2017-11-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bundle data source files which don't exist at qmake time need to be handled specially. This also required splitting the generated list of public headers, as was already done for private ones. Task-number: QTBUG-60413 Change-Id: I97acfa88622da6b73839b8f976f73ace3cb10223 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Enable deprecation warnings for Qt plugins, just like for modulesTor Arne Vestbø2017-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We want to know when a plugin uses deprecated Qt APIs, especially deprecations in the QPA APIs, which today is not the case, so platform plugins have no idea that they should transition. Change-Id: If9d3d95dc6f1f4178b103f177c9eb8326767ffab Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-051-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/minimum-linux.S src/network/access/qhttpthreaddelegate.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
| * | Fix GCC -Wfloat-conversion warnings (available since GCC 4.9)Thiago Macieira2017-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning used to be part of -Wconversion, but that generates too more noise than we're willing to fix now (like conversion from qint64 to int). The float conversion does trigger for conversion from double to float, as shown in all the QVectorND uses of float, but more importantly, it triggers on passing floats to ints. Change-Id: I69f37f9304f24709a823fffd14e69cfd33f75988 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-10-246-33/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/windows/qwindowsmousehandler.cpp src/plugins/platforms/xcb/qxcbimage.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/manual/qtabletevent/regular_widgets/main.cpp Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io> Done-with: Mårten Nordheim<marten.nordheim@qt.io> Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
| * | Fix resolution of QMAKE_INFO_PLIST for non-bundle artifactsAlexandru Croitor2017-10-231-1/+2
| | | | | | | | | | | | | | | Change-Id: Id56cea1f09d7675fe60cdbd598e6f585a6b230d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | MinGW: Globally define WINVER and _WIN32_WINNT to enable Windows 7 APIOrgad Shaneh2017-10-191-0/+3
| | | | | | | | | | | | | | | Change-Id: I637b33ba6d05f40486d8da927ae5cc5148299348 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-164-32/+18
| |\| | | | | | | | | | Change-Id: I3cf73c53cf131d0babfb558c2507bed0e0fc5f08
| | * Qmake: Introduce and use QMAKE_{SYSTEM,SHELL}_NULL_DEVICE variable, take 2Orgad Shaneh2017-10-134-32/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SYSTEM is used for system() calls, while SHELL is used in the target Makefiles. Task-number: QTBUG-62985 Change-Id: Ia75d3939c59c98699359421166433e8b4a6ee35e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-173-2/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-041-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qconfig-bootstrapped.h src/corelib/global/qglobal.h src/corelib/tools/qcryptographichash.cpp src/corelib/tools/qcryptographichash.h src/corelib/tools/qmessageauthenticationcode.cpp src/plugins/platforms/windows/qwindowswindow.h tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a
| | * Add support for ICC in toolchain.prfTony Sarajärvi2017-09-291-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62531 Change-Id: Ie15a349c830258058d48c9da18b52b343bdb943a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | qmake: Allow non-bundle apps and libs to have an Info.plistTor Arne Vestbø2017-09-291-0/+17
| | | | | | | | | | | | | | | Change-Id: I5fe5c8d3214876520b5259d478ac9ef887c61e95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Make it an error to omit __builtin_available where neededJake Petroules2017-09-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | This guarantees that we have proper version checks in place for APIs on Apple platforms that are not necessarily available on the deployment target. Change-Id: I10060f8b910f2bb790aa4a9c6f8c5cdc14d7cf06 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-09-264-6/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h src/plugins/platforms/cocoa/qcocoawindow.h src/testlib/qtestsystem.h Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-203-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/util/qcompleter.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmdisubwindow.cpp Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
| | * Mark Clang 5.0 as warning-freeThiago Macieira2017-09-181-2/+2
| | | | | | | | | | | | | | | Change-Id: I27b55fdf514247549455fffd14b17a4ae1d8ff2d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Fix conditions in some QMAKE_COMPILER_DEFINES assignmentsRobert Loehning2017-09-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We obviously should check the variable we're about to get the data from. Amends 1216f596bdb. Change-Id: Ibe87138b9c9aa99837b4fbf3769cd26ca1aaacb9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Fix quoting of mocinclude.opt for paths containing spacesJoerg Bornemann2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If MOC_INCLUDEPATH exceeds a certain limit, its content is written into a file named mocinclude.opt, which is then passed to moc as a response file. That moc parameter was not properly quoted, and the moc call failed for paths containing spaces. Task-number: QTBUG-63197 Change-Id: Ib0542d80ce1bab239e0e6b6e24fadd11007b1846 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-061-0/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/qopenglwidget/main.cpp src/3rdparty/pcre2/src/pcre2_printint.c src/plugins/platforms/cocoa/qnsview.mm src/widgets/widgets/qcombobox.cpp Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
| | * Add qmake feature and configure option to use ccacheTor Arne Vestbø2017-09-051-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled via configure --ccache, or CONFIG += ccache in 3rd party projects. Ensures that we use the right sloppiness and other ccache options during compilation. Task-number: QTBUG-31034 Change-Id: I696b3d3f0398873a29b93d1bc2b4d4e06ef23dc9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Remove obsolete fileJake Petroules2017-09-101-108/+0
| | | | | | | | | | | | | | | | | | | | | | | | Amends cab060631 Task-number: QTBUG-62995 Change-Id: I374153ec34abad0585d2bcab0f699b42600be6ef Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Android: remove support for local/debug deploymentJake Petroules2017-09-061-24/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: I3fa6819259be365b7a697f7db1d1d01a94032395 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-313-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/examples.pro qmake/library/qmakebuiltins.cpp src/corelib/global/qglobal.cpp Re-apply b525ec2 to qrandom.cpp(code movement in 030782e) src/corelib/global/qnamespace.qdoc src/corelib/global/qrandom.cpp src/gui/kernel/qwindow.cpp Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08) src/network/ssl/qsslkey_openssl.cpp src/plugins/platforms/android/androidjniinput.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/widgets/widgets/qmenu.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
| * configure: Disable warnings in configure testsThiago Macieira2017-08-241-0/+3
| | | | | | | | | | | | | | No need to log them. Change-Id: I3868166e5efc45538544fffd14d8c3cc0012ba12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Use libc++ instead of libstdc++ when compiling with android-clang mkspecBogDan Vatra2017-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang+libc++ is the only supported way by Google nowadays. libstdc++ is too old and already fails to build some C++11 apps e.g. missing std::to_string(). android-g++ mkspec still uses libstdc++ and g++. Use -isystem to include system headers instead of QMAKE_INCDIR_POST (-I). Task-number: QTBUG-60455 Change-Id: Iba8b04594c2e5e2832e6cf480e4e52ff31ad4106 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Propagate all module defines to CMake config filesVolker Krause2017-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | So far this only covered the QT_xxx_LIB define, but not any other defines a module might export (such as QT_NO_QML_DEBUGGER which hasn't been ported to the new configure system yet). Change-Id: I8aae2354fed77a6f0e527ad8d63d25654bb067d0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Introduce OBJECTIVE_HEADERSFrancois Ferrand2017-08-251-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a ObjC++ QObject subclass is listed in the regular HEADERS, qmake creates a .cpp file. The moc file will then fail to compile, as it requries ObjC++ headers. Using Q_FORWARD_DECLARE_OBJC_CLASS() can be used to let the class be parsed by The compiler, but link will still fail, as the generated methods (e.g. signals) must be built with ObjC++ compiler, in case they have ObjC parameters: Q_FORWARD_DECLARE_OBJC_CLASS(NSString); class MyClass: public QObject { Q_OBJECT signals: void objcSignal(NSString * myObj); }; The canonical workaround for that is including the .cpp file into the corresponding .mm file. This also offers a compilation speed advantage, but is somewhat counter-intuitive. Therefore, we introduce a separate variable which instructs moc to create .mm files directly. Task-number: QTBUG-1581 Change-Id: Ia98af58006efd168ea37f3a63c396979e7e81baa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Fix CMake version resolvingTor Arne Vestbø2017-08-161-5/+7
| | | | | | | | | | | | | | Otherwise 3.8.1 is treated as not recent enough than the required 2.8.3 Change-Id: I198fc7d54e3da935fd163c9b9bb7dc12b986d1c2 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 16:39:18 +0000