summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-19163-3418/+1270
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
| * Android: fix missing wheel eventsJ-P Nurmi2017-06-183-0/+40
| | | | | | | | | | | | Change-Id: I65b4f6a8fcbdad537a984064e332a4a1f34a265a Task-number: QTBUG-43669 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Fix tst_QImageReader::imageFormatBeforeReadAllan Sandfeld Jensen2017-06-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | The test was never loading images from a valid path, and thus never had any fullfill the base option which meant nothing was tested. Making it work revealed that the Format option on BMP formats doesn't predict semi-transparent files. Change-Id: I7035a0f63ebfbce940ce7a17a6142cf177480798 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Fix reading qle_signedbitfield as intAllan Sandfeld Jensen2017-06-181-1/+1
| | | | | | | | | | | | | | | | | | The type-cast to int for qle_signedbitfield was wrong for all cases where width + pos != 32. The class is currently only used two places though, both where that happen to apply. Change-Id: I108c565b75c9f29dd49b5e2e39f84910d17ead85 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Blacklist tst_QGuiEventLoop::processEvents in macOS 10.12Tony Sarajärvi2017-06-181-0/+2
| | | | | | | | | | | | Task-number: QTBUG-61131 Change-Id: Ia54d0976f73e733199503e3510daf3d6fa4253a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Extend blacklisting of tst_QElapsedTimer::elapsed to cover macOS 10.12Tony Sarajärvi2017-06-181-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-58713 Change-Id: I0c467c1abcdd1284910e0a61f98646e943eae377 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Blacklist flaky tst_QTimeLine tests on macOS 10.12Tony Sarajärvi2017-06-181-0/+3
| | | | | | | | | | | | Task-number: QTBUG-61037 Change-Id: I604bbc815c16a5ab436d2ff4936d96d3a2d27dab Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * rename qglobalstatic.cpp -> qglobalstatic.qdocOswald Buddenhagen2017-06-172-3/+0
| | | | | | | | | | | | | | | | it contains no code. Change-Id: Ie8a43abb2db3d040f7046206adf2bf555960dd9c Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * rework detection and use of clock_gettime()/librtOswald Buddenhagen2017-06-175-12/+12
| | | | | | | | | | | | | | | | recent versions of glibc include clock_gettime() inside libc itself. Task-number: QTBUG-41009 Change-Id: I7401773be99682a356bf06a69571d11c4b15978b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * don't auto-create install targets for static libsOswald Buddenhagen2017-06-172-1/+2
| | | | | | | | | | | | | | | | | | these are not meant to be deployed, so the install hack should skip them. Task-number: QTBUG-42830 Change-Id: I870499dca2cfea87bf0048f019d651ce9cc5d788 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * don't overwrite pre-existing INSTALL for targetOswald Buddenhagen2017-06-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | while it's mildly insane that we auto-generate install targets to start with, we can at least refrain from doing so if there is one already. as it happens, this removes the need for excluding the qt build explicitly. Task-number: QTBUG-38452 Change-Id: I74d5df447fba525fa79896c9be2c71d82bc2c6ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * make sql drivers independently configurableOswald Buddenhagen2017-06-177-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our binary packages come without many sql drivers, because they have proprietary dependencies we cannot ship. not every user wants to build all of qt from scratch, so it makes sense to make it possible to "enrich" the existing installation by compiling just the drivers. to enable this, the drivers' configuration must be independent. but note that it's still not possible to configure a single driver - the entire sqldrivers directory is configured at once. a side effect of this is that the availability of the sql plugins cannot be made known with publicFeatures any more, because there is no associated module pri file to put that information into. that should be made inconsequential by making qtHaveModule() work for plugins. Task-number: QTBUG-58372 Change-Id: Ibdebe3199688a57f93cea82dc15623081d1280f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * xcb: Remove XIproto.h include from qxcbxsettings.cppAlexander Volkov2017-06-161-12/+3
| | | | | | | | | | | | | | | | | | | | | | It indirectly includes X.h with LSBFirst and MSBFirst macros. Use XCB_IMAGE_ORDER_LSB_FIRST and XCB_IMAGE_ORDER_MSB_FIRST macros instead and remove unneeded XCB_USE_XLIB guards. Change-Id: Ic24c9605d0a627253f2793f9feab6c6e19dcda08 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> (cherry picked from commit 538b9f504c0de11c473a40aed66df9900ac1c6c4) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Blacklist tst_QWidget::restoreVersion1Geometry for XCBFriedemann Kleint2017-06-142-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FAIL! : tst_QWidget::restoreVersion1Geometry(geometry.dat) Compared values are not the same Actual (((widget.pos()))): QPoint(90,90) Expected (expectedPosition): QPoint(100,100) Loc: [tst_qwidget.cpp(3193)] Remove the previously added QSKIP since this test now passes. Task-number: QTBUG-26421 Task-number: QTBUG-46116 Change-Id: Ieff474a8a69c14a0df231a9a587aee02df4e8ea7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Direct2D: Fix build with MinGW 7.1Friedemann Kleint2017-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | qwindowsdirect2ddevicecontext.cpp:92:105: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'HRESULT {aka long int}' [-Werror=format=] qWarning("%s: EndDraw failed: %#x, tag1: %lld, tag2: %lld", __FUNCTION__, hr, tag1, tag2); Change format to long and cast argument to long for extra safety (should some obscure MinGW header define another type). Change-Id: I7e6cb8ea1e5c27ef104b162ced9a696ab252fd8d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * winrt: doc: Update platform limitations for UWPMaurice Kalinowski2017-06-141-0/+11
| | | | | | | | | | | | | | | | | | UWP only allows clipboard access when the app is active and has focus. Task-number: QTBUG-60900 Change-Id: Ia69642740d894106875cef77adf48e934bae9c87 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
| * Add warning about missing but required CPU featuresThiago Macieira2017-06-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful to debug why you're getting SIGILL, like running under Valgrind: Processor features: sse3[required] sse2[required] ssse3[required] fma cmpxchg16b sse4.1[required] sse4.2[required] movbe popcnt[required] aes[required] avx[required] f16c[required] bmi[required] avx2[required] bmi2[required] !!!!!!!!!!!!!!!!!!!! !!! Missing required features: rdrand rdseed !!! Applications will likely crash with "Invalid Instruction" !!!!!!!!!!!!!!!!!!!! Change-Id: Ia3e896da908f42939148fffd14c556557419b091 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Manual dialog test: fix use custom directory icon option settingDongmei Wang2017-06-131-1/+1
| | | | | | | | | | | | | | | | In FileDialogPanel::options(), QFileDialog::DontUseCustomDirectoryIcons was set when the "Don't use custom directory icons" box wasn't checked. Change-Id: I6e9d9b41cf91f4abcc98c02bed44675908a8391d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Follow KDE settings for menu and toolbar fontsAllan Sandfeld Jensen2017-06-131-0/+8
| | | | | | | | | | | | | | | | Makes pure Qt applications integrate better when those fonts don't match the general fonts. Change-Id: Ic06e8595efc44f0c6649cf364e751c4c714cda93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Blacklist flaky tst_QMdiArea testTony Sarajärvi2017-06-131-0/+2
| | | | | | | | | | | | Task-number: QTBUG-61381 Change-Id: I5f47315b32b74245479b73297f64944ac929c2b6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Enable stack-protector-strong for QNX 7.0.0James McDonnell2017-06-138-19/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally enabled in the mkspecs for 64-bit QNX 7.0.0 but that broke when the qtConfig change was made. It looks like qtConfig shouldn't be used in the platform mkspecs. I suspect the stack-protector changes were left out of the 32-bit mkspecs so that 6.6.0 builds wouldn't be affected. Ignore the stack-protector/stack-protector-all possibility since it isn't possible to access it without a command line option. Specifying both options doesn't even make sense since stack-protector-all encompasses stack-protector. For now, leave out command line control of this feature. Task-number: QTBUG-59644 Change-Id: I99323216be5b592dd2c3bef6d22da195764a6e65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Fix tst_QIcon for configurations with builtin_testdataOliver Wolff2017-06-132-2/+2
| | | | | | | | | | Change-Id: Ibf9fcf7d3a8d58c9c488637a45985593950defaf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * winrt: Fix tst_QImageReaderOliver Wolff2017-06-131-1/+1
| | | | | | | | | | Change-Id: I3a7db49329d8f1677c17267f5878d5144ad37823 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Doc: Do not exclude *_x11.cpp files from the documentation buildTopi Reinio2017-06-131-2/+1
| | | | | | | | | | | | | | | | QX11Info class from the Qt X11 Extras module is documented in qx11info_x11.cpp, and it needs to be parsed. Change-Id: I32e8415d93e67dbf16267d4af63979c1db0870b0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Remove message of integrityfb from config summaryKimmo Ollila2017-06-131-1/+0
| | | | | | | | | | | | | | | | | | This cleans the config summary output Change-Id: I4e78f00c722e646a730906d462f7632d6012a6d8 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tero Alamaki <tero.alamaki@qt.io>
| * uic: Fix possible crash when reading the size hint propertyJarek Kobus2017-06-133-120/+207
| | | | | | | | | | | | | | | | It may crash on (probably a bit broken) qtbase/src/printsupport/dialogs/qpagesetupwidget.ui Change-Id: Ibca95a3d8aa4899adbc952aee7b46621ac888c6a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * ANGLE: Fix crash with ltcg on Visual Studio 2015 Update 3Oliver Wolff2017-06-134-11/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | Release builds of applications that used Qt configured with "link time code generation" crashed (memory access violation), when calling GetInternalFormatInfo in Context::initCaps. It looks like this is a compiler problem that can be avoided by not using a reference for the return value. Task-number: QTBUG-55718 Change-Id: Ic1fb95d7b518a49859f41c819e860864387a8d3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * QLogging: Fix unused static function warningOrgad Shaneh2017-06-131-1/+1
| | | | | | | | | | | | | | Detected by clang Change-Id: Ia7d1bf085d838d19319ee1060dcb3c0086a510e4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Use QMap in QProcessEnvironment so variables are sortedThomas Sondergaard2017-06-134-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation for this change is to make it simple to pass a correctly sorted environment block to Win32 CreateProcess(). It is also nice in other contexts that the environment variables are sorted. The change is made for all platforms. This keeps it simple and the only ill effect is slightly slower lookups. Concerning the environment block passed to Win32 CreateProcess: The environment block that is passed to CreateProcess() must be sorted case-insensitively and without regard to locale. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms682009(v=vs.85).aspx The need for sorting the environment block is also mentioned in the CreateProcess() documentation, but with less details: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx Task-number: QTBUG-61315 Change-Id: Ie1edd443301de79cf5f699d45beab01b7c0f9de3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Rename QProcessEnvironmentPrivate::hash to varsThomas Sondergaard2017-06-135-30/+30
| | | | | | | | | | | | | | | | | | Also use auto for iterators to vars. This is a small refactoring in preparation for changing type of vars to QMap. Task-number: QTBUG-61315 Change-Id: I5731d7916b6f54a0da5be2da378c09a7688bd870 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * GitIgnore config.status.bat and config.tests/.qmake.stashOrgad Shaneh2017-06-131-1/+2
| | | | | | | | | | Change-Id: Ia53119f8fbbe13b4865378833dcdac73c9368d9b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qsslsocket_mac - check that SecCertificateRef is not nullTimur Pocheptsov2017-06-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's the only place there we can potentially pass a null pointer to CFArrayAppendValue (all other calls are conditionally-protected). This results in (surprise! ... ?) Objective-C exception (while we call something that is a pure-C API). So far we cannot reproduce this crash and can only speculate: probably this happens with invalid (can be either really invalid or the result of our generic QSslCertificate's failure to read/ parse)) custom CA certificates appended to a QSslConfiguration object by applications using QSslSocket/QNAM. The fix will probably make a handshake to fail, but this seems to be better than a crash anyway. Task-number: QTBUG-58213 Change-Id: Ie4f9ab2138bc383adc9f9ed55ed61be2d3cf7020 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * macOS/iOS: Correctly ignore punctuation in QCollatorAndy Shaw2017-06-133-31/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When punctuation is ignored then the kUCCollatePunctionSignificantMask should not be set. This was originally thought to not be working due to a bug on the Apple platforms, but this is not the case. [ChangeLog][Platform Specific Changes][macOS][iOS] QCollator now respects the ignorePunctuation property on Apple based platforms correctly. Task-number: QTBUG-41978 Change-Id: I62044076387d6e4479f4aaef3c2f48f49dbd160e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Android: Fix RTL selection handles directionsBogDan Vatra2017-06-136-17/+29
| | | | | | | | | | | | | | | | Invert the selection handles icons when the selected text is rtl. Task-number: QTBUG-61073 Change-Id: I8339a14d1e4d9e79d218516daf3ac783911f6026 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * QNSView: Remove tracking area on deallocationGabriel de Dietrich2017-06-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ultimately, the tracking areas seem to be managed by the NSWindow (or at least somewhere else than the NSView itself). So, it can happen that we involuntarily leave dangling pointers in the system after the QNSView is released. This has shown to crash applications creating and deleting many native views on a single QNSWindow, e.g. calling winId() on a complex and dynamic QWidget hierarchy. The crash would happen when the QNSWindow receives a native enter event, which results on Cocoa trying to invoke the owner of a previously deallocated NSTrackingArea. Change-Id: I3ca7a39ee5f1ec51c2215639f61ba907de3d8659 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * qsimd_p.h: Don't set the __xxx__ variables with Clang and GCCThiago Macieira2017-06-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 418184c2a0ad97cce12717a43f84fa6f12ece189 set some extra defines that Clang and GCC do set so that MSVC and ICC builds would properly get the features detected. But that meant we set them with Clang and GCC (technically, set them again, but to the same value so no warning was printed). Don't do that. This commit allows me to use "-march=native -mno-rdrnd" to disable the unconditional use of RDRAND instruction. That's required to valgrind any applications, as the current version (3.12) does not have support for that instruction. vex amd64->IR: unhandled instruction bytes: 0x48 0xF 0xC7 0xF0 0x48 0x8B 0x55 0xE8 0x48 0x89 vex amd64->IR: REX=1 REX.W=1 REX.R=0 REX.X=0 REX.B=0 vex amd64->IR: VEX=0 VEX.L=0 VEX.nVVVV=0x0 ESC=0F vex amd64->IR: PFX.66=0 PFX.F2=0 PFX.F3=0 ==78321== valgrind: Unrecognised instruction at address 0x4ef159c. ==78321== at 0x4EF159C: _rdrand64_step (immintrin.h:208) ==78321== by 0x4EF159C: qt_random_cpu(void*, long long) (qrandom.cpp:95) Change-Id: Ia3e896da908f42939148fffd14c6884501de4fa4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * JSON doc: update the RFC we link toThiago Macieira2017-06-121-1/+1
| | | | | | | | | | | | | | RFC 4627 is obsoleted by RFC 7159. Change-Id: Ia53158e207a94bf49489fffd14c6ab1ae0a19a72 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Convert features.columnview to QT_[REQUIRE_]CONFIGStephan Binner2017-06-126-24/+19
| | | | | | | | | | | | | | Side effect: fix of QT_NO_COLUMNVIEW <-> QT_NO_QCOLUMNVIEW inconsistency. Change-Id: I42702ea7b362a4b6fb5dad78ee105e6cbbf8bcf6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Only use -Xarch when specifying precompiled header if building multi archTor Arne Vestbø2017-06-121-1/+5
| | | | | | | | | | | | | | | | | | | | The -Xarch option is not supported by ccache, so unless we need to distinguish precompiled headers for multiple architectures it's better to not pass it. Change-Id: Iae02d37f7a89aedebecedff7290f88d2de1ca362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Drop dead qfiledialog_embedded.uiStephan Binner2017-06-122-355/+1
| | | | | | | | | | Change-Id: Ia20fe65d08a8a477dc1c56ad5dcd3db5144c25a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Add /NOLOGO to midl and rc callsJoerg Bornemann2017-06-121-2/+2
| | | | | | | | | | | | | | | | This removes clutter from build logs. Task-number: QTBUG-52383 Change-Id: If057f26df017eb9c53a57bc2ba825ae2191130bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Doc: Tweak documentation about a default QHostAddressKai Koehne2017-06-121-6/+10
| | | | | | | | | | Change-Id: I78deb7156900a3a0e79890062a40752b5d2561c3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Document QHostAddress::swapKai Koehne2017-06-121-0/+8
| | | | | | | | | | | | Change-Id: I0f47ffeb1a7dbda7dadbd78b2ea04167c42a503d Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * Refactor tst_QStyleSheetStyle::focus/hoverColors()Friedemann Kleint2017-06-121-50/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Put all widgets in one dialog so that show/setActive occurs only once. - Use the center of the widget geometry for positioning. - Remove BypassWindowManagerHint which likely causes qWaitForWindowActive() to fail. - Move the cursor out of the way and subsequently send mouse events to the QWindow Task-number: QTBUG-51400 Change-Id: I2176d8dbaead72d7a6fa89aa769e4c804eea7a0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * qmake: Delete static library before calling ar on MinGWOrgad Shaneh2017-06-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This was already done on unix, but not for MinGW. If the archive already exists, it is appended rather than replaced. This can cause invalid references when whole-archive linking is used and some object file that was already linked was deleted. Change-Id: Ie265371f197d996d57002b248043736544ee641e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: Fix initialization order in VcprojGenerator ctorOrgad Shaneh2017-06-121-2/+2
| | | | | | | | | | | | | | Detected by clang Change-Id: I17b49b1737ca4a9ab6608a5d8701a9e1c50af5ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: Use braces for struct initialization in MSVC object modelOrgad Shaneh2017-06-121-9/+9
| | | | | | | | | | | | | | Detected by clang Change-Id: I4c5fbdb402f55ce40e84a6a40ead6c32a60cfa22 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * qmake: Delete unused variables in MSBuild object modelOrgad Shaneh2017-06-121-27/+0
| | | | | | | | | | | | | | | | | | Detected by clang. Remove also comments that reference unused variables. Change-Id: I6de54d96cd23b93eed6d109629a9462b7770e94e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: Avoid raw string comparisonOrgad Shaneh2017-06-121-1/+1
| | | | | | | | | | | | | | | | Detected by clang. Change-Id: I4c734d1af77a331d178ce91610ab08a8048fe410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * Do not disable MSVC extensions when generating moc_predefs.hJoerg Bornemann2017-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not pass /Za to MSVC to generate moc_predefs.h, because this option is incompatible with compiler options like /fp:fast that may be user-specified. The /Za option added, because moc failed parsing header files that contain MSVC extensions. Moc was fixed in 94a2aec0, and we can safely remove the /Za option. Task-number: QTBUG-58391 Change-Id: I9791224b1773d0f81d2bbb7915787a7c5e68430c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 08:19:53 +0000