summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* HTTP/2 - fix 'GOAWAY' frame size validationTimur Pocheptsov2016-07-251-2/+6
| | | | | | | | | Found while implementing cleartext http2 (and sending some erroneous frames) - GOAWAY can have some 'opaque debug information payload' so the frame's size is at least 8 bytes, but can be more. Change-Id: I90fb8a3df22768673c4f40ba3bf6a3f5ffe33058 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Q(Basic)Mutex: add try_lock{,_for,_until} for STL compatibilityGiuseppe D'Angelo2016-07-253-241/+874
| | | | | | | | | | | | | Now QBasicMutex is Lockable and QMutex is TimedLockable, which means they can be used in std::lock_guard, std::unique_lock, std::lock, etc. [ChangeLog][QtCore][QMutex] QMutex now fully models the TimedLockable concept by providing the try_lock, try_lock_for and try_lock_until functions, therefore making it usable in Standard Library lock management classes and functions. Change-Id: I7c691481a5781a696701e1ab78186b5cefbd6a87 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Extend tests in new json config file to cover UIKIT platformsMike Krus2016-07-251-3/+3
| | | | | | | Replace ios tests with uikit to include tvos Change-Id: Ifc67d556a2b3b24532d0f87b12599420f895ddbd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* MySQL: Use charset utf8mb4 to allow 4-byte charactersPhilip Seeger2016-07-241-2/+7
| | | | | | | | | | | | | | | | | In MySQL, the character set named utf8 uses a maximum of 3 bytes per character and contains only BMP characters. It does not support supplementary characters. In version 5.5.3, a new UTF-8 character set called utf8mb4 has been introduced, which supports 4-byte characters. [ChangeLog][QtSql][QSqlDatabase] When connecting to a MySQL server whose version is 5.5.3 or higher, the default connection charset is now utf8mb4 instead of utf8 to allow 4-byte UTF-8 encodings. Change-Id: I718bd23212afd67367b39d4ce7da2a99ae0f1cca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QRingBuffer: add packet modeAlex Trotsenko2016-07-232-22/+44
| | | | | | | | | | | As a special case, setting the value of chunk size to zero forces QRingBuffer to produce a separate QByteArray on each call which appends the data. So, this enables a packet mode where portions of data are stored independently from each other. Change-Id: I2d0b331211901a289da7d4533e974f06830b5590 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QRingBuffer: allow to change the chunk size of the buffer dynamicallyAlex Trotsenko2016-07-233-0/+16
| | | | | | Change-Id: I0ac55713c7bb8c48d2c9c774376543caef781980 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Improve accuracy in fast path bilinear samplingAllan Sandfeld Jensen2016-07-232-41/+64
| | | | | | | | | Adds rounding before using the optimized low accuracy interpolation, this reduces the magnitude of error in the scaled result from ~4 bits to just 2 bits. Change-Id: Ie4e618bf5b1f4a74367aa419ebbd534cc6a846b3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* QCocoaApplicationDelegate: Remove unused functionGabriel de Dietrich2016-07-231-6/+0
| | | | | | | | | This seems to be a leftover from pre-QPA Cocoa menus time. Change-Id: I1bcfb3a882f500a63a5dec0fbe01f4541e14d54a Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Use QElapsedTimer in tst_qmutexGiuseppe D'Angelo2016-07-222-14/+69
| | | | | | | | | | | | | | | | This requires fixing the test on Windows: QMutex internally uses WaitForSingleObjectEx which can wake up early, according to the system timer resolution: https://msdn.microsoft.com/en-us/library/windows/desktop/ms687069(v=vs.85).aspx#waitfunctionsandtime-outintervals QTime must be so slow that it hides the early wakes, but QElapsedTimer is accurate enough to make the test fail unless we add back some tolerance to compensate for the early wakeups. Change-Id: I20b38af9c87a0b0e38a19b9bff1c3c24975c78f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make QCocoaMenuLoader a singletonGabriel de Dietrich2016-07-225-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | In some auto-tests, we create several instances of QGuiApplication (though seldom, if ever, simultaneously). However, the QCocoaMenuLoader instance was never properly deallocated, resulting in NSApplication.servicesMenu to still be assigned. This resulted in an exception being raised (NSInternalInconsistencyException) the second time we would construct a QCocoaMenuLoader. The CPU cycles saving solution is to make QCocoaMenuLoader a singleton. This approach is also safe since this class' initialization doesn't depend on any state in QGuiApplication (even the application name is fetched from either the main bundle or the app's args). This also allows us to clean up some code in QCocoaApplication and QCocoaApplicationDelegate who have suffered from lack of attention over the years. Change-Id: Ic4c859d628ab8abd9b469b99c64293582f8e363d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Add missing overloads for custom verbsRichard J. Moore2016-07-222-0/+43
| | | | | | | | | When support for custom verbs was added the overloads for the various body data options were not. Task-number: QTBUG-54868 Change-Id: I1a495023d957fc71d1e3b77997a2b4b8531c0a0e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change test's entry point only when actually building it for winrtMaurice Kalinowski2016-07-221-5/+5
| | | | | Change-Id: I14de901e8cf16d0172a4bd35611c17de753348be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* QMetaType: Add a benchmark covering creation of QVariant from an enumRobin Burchell2016-07-221-0/+32
| | | | | | | | | | | This proved to be quite slow in the past due to QReadWriteLock's implementation being suboptimal (prior to its improvement in 343e5d066a6b5583688e16baec20f20e6d9a24e0). This codepath is exercised quite extensively by QML with enum registrations. Change-Id: I94d1e13933bf005604dc4494e2cb5bc25ef3d387 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* don't clear the rest of the command line when -redo is usedOswald Buddenhagen2016-07-222-13/+13
| | | | | | | | it's entirely reasonable to extend the saved command line by new arguments. note that these are not saved in turn. Change-Id: I02c1a2b33e93c85b3a29c50de00c2e5334f6ef51 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* remove the configure.exe -loadconfig/-saveconfig optionsOswald Buddenhagen2016-07-221-23/+2
| | | | | | | | | | | | these options don't seem particularly useful (they were added in 2001 without any indication of the intended usage). maintaining multiple static configurations can be best achieved with a script (outside the build directory, which these options didn't permit to start with). this obsoletes QTBUG-46690, which refers to these options. Change-Id: I994c18481cd63d256bb7a6d1948c57f7bd480614 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Revert "Save the pkg-config settings in config.status"Oswald Buddenhagen2016-07-221-4/+0
| | | | | | | | | | | | | it's somewhat questionable to save the environment of pkg-config, but not that of many other things we use. additionally, we now have logic to automatically set it up from the sysroot when it's missing. This reverts commit 228392aff231f105116738df6c4286af257407c7. Change-Id: I0612c196c9a5023bb3ef436aebfb87cb46d8cd14 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* print an empty line after every reportOswald Buddenhagen2016-07-221-9/+11
| | | | | | | | | otherwise we get an unintelligible mess if multiple messages are emitted in the same category. also, there were already empty lines between categories, so it was also inconsistent. Change-Id: I5e6622bc8a5d2773bbd99124cedf4e3eb73b8a60 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make use_new_dtags a linux-only featureOswald Buddenhagen2016-07-221-2/+6
| | | | | | | it's the only OS with braindead "old" dtags in the first place. Change-Id: I0fba436ff3f9fc061c1741b1899ca133b8ad6b5e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* permit wrapping expressions in the json fileOswald Buddenhagen2016-07-221-0/+1
| | | | | | | | the json parser passes line breaks verbatim, so we need to get rid of them ourselves. Change-Id: I3b71fe54dcaa8c3a2ff94e8ac4845f49dabe1663 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make 'feature' report type always use the feature descriptionsOswald Buddenhagen2016-07-222-12/+7
| | | | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused when this type was invoked explicitly (because of using a condition). adjust the neon/mips_dsp/mips_dspr2 descriptions to match the context and remove the now redundant "message" fields. Change-Id: I08558f342a0d9189a37145085e5470f91a9d0881 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make firstAvailableFeature report type use the feature descriptionsOswald Buddenhagen2016-07-222-4/+4
| | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused for this type. adjust the c++* descriptions to match the context. Change-Id: I2a76b5651892bf9bd6fec315e446bfdb7c3aee97 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make featureList report type use the feature descriptionsOswald Buddenhagen2016-07-222-17/+17
| | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused for this type. adjust the sse/avx/avx512 descriptions to match the context. Change-Id: Icf514718355c6ccd608d825b70296cc0383dbfe8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* add missing "enable" fields to opengl featuresOswald Buddenhagen2016-07-221-0/+2
| | | | | | | | this ensures that we complain if desktop gl or gles2 is explicitly requested but not available. Change-Id: Iad068ef34cdf9353cb483d4dc667ddd85ded740d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* add missing "enable" field to openssl featureOswald Buddenhagen2016-07-221-0/+1
| | | | | | | | | this ensures that an explicitly requested linked/runtime support is complained about when the test fails. the old configure would do that as well. Change-Id: I7f235fa7df5e5d53938de0e32b07536447b8d1d4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* unify openssl options with the d-bus onesOswald Buddenhagen2016-07-221-1/+2
| | | | | | | | introduce -openssl-runtime and -openssl [no|yes|linked|runtime] for consistency with the respective dbus options. Change-Id: I061b46b52b3132ead4332b33f7a60d6fe0e73ab9 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* simplify conditions of dbus-linked featureOswald Buddenhagen2016-07-221-3/+2
| | | | | | | ... by chaining it to the dbus feature, as is done for openssl/-linked. Change-Id: Id1f9f761914c356d2a0056aa80213954dce3403d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* accept plain -dbus optionOswald Buddenhagen2016-07-221-1/+1
| | | | | | | the feature's logic is already prepared for that. Change-Id: Ieb0131904b532409fc01bafca9f85fb22039a68a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix recognition of -no-verboseOswald Buddenhagen2016-07-221-0/+5
| | | | | | | | while probably not too useful, the old configure does allow explicitly disabling verbose mode. Change-Id: If0585443c649a67f616b3668cc90b18fecde11ba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* don't mention config.log in error messages when not applicableOswald Buddenhagen2016-07-221-3/+7
| | | | | Change-Id: I127bc23c667d337bbe2518e7364ca99db9a3163a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* don't error() out on user errorsOswald Buddenhagen2016-07-221-3/+6
| | | | | | | use the proper error reporting mechanism instead. Change-Id: I3afb0086e5cd672d3c0f441c429682850202024f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make command line parsing error messages consistentOswald Buddenhagen2016-07-221-6/+6
| | | | | | | ... by adding some quoting and punctuation. Change-Id: I553171a0c001edc195fcf2e85f0f70bf2cfdd728 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devEdward Welbourne2016-07-22161-946/+1821
|\
| * Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-19161-946/+1821
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. 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 tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584
| | * Fix typo in doc snippets of qOverload and relatedFriedemann Kleint2016-07-191-6/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-54808 Change-Id: Ic565710e4d3a95abf98d4696ae7c0001a9171697 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Edward Welbourne2016-07-1963-268/+721
| | |\
| | | * Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-1563-268/+721
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakeevaluator.cpp One side changed the iterator to use ranged-for, the other changed its body; they only conflicted because the latter had to add braces around the body, intruding on the for-line. Trivial resolution. Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b
| | | | * PathStrokeRenderer::initializePoints(): use float divisionEdward Welbourne2016-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The (example) code used a real to hold 360 / 7, which is of course 51, discarding the 3/7 that was most likely meant to be kept. Noticed by Coverity (CID 22364). Use 360.0 instead of 360 to get more accurate results. Change-Id: Ifdfbb932589d8ea728710e8b656af651c9f8a7d2 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | | | * Windows: Add a workaround for render-to-texture widgets for translucent windowsFriedemann Kleint2016-07-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not attempt to switch from translucent GL windows (emulated by DWM blur behind) to translucent raster windows (using layered windows) as this produces warnings from UpdateLayeredWindowIndirect() failing. Task-number: QTBUG-54734 Change-Id: Ie05126c5cb091a00f17b88a74b287c90aa2dfebd Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | | * moc: Fix a crash with malformed inputOlivier Goffart2016-07-152-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not increment 'data' past the buffer in case of invalid token. Remove the left over qDebug so we can make a test. Task-number: QTBUG-54609 Change-Id: I8f0dd3381fbdea3f07d3c05c9a44a16d92538117 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| | | | * Windows QPA: Add warning to setHasBorderInFullScreen()Friedemann Kleint2016-07-151-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit a warning when the function is called before show() as it does not have any effect in that case. Amends change 69839e55c13000ee9bf8d8e9d74b70096a92ae51. Task-number: QTBUG-41309 Change-Id: I7c2bb21735d8e41d525c5e00213b0e278ae5c774 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | | | * QWindowsTheme: Fix the available file icon sizesFriedemann Kleint2016-07-153-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, QWindowsTheme had a hardcoded list of of available file icon sizes. As the sizes depend on the Windows display scale factor, this can lead to undesired scaling of icons. Maintain an array of the standard sizes against which the sizes are matched; refresh in display change. Task-number: QTBUG-54561 Change-Id: If36de2f30c8a230cc7bd8eeb4dfc9f201aeda5e4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | | | * [iOS] Blacklist iOS with regards to bgra supportAndy Shaw2016-07-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of devices are indicating that there is a problem with using bgra so instead of blacklisting all of them individually it is best to blacklist them all on the iOS platform. This ensures QQuickItem::grabToImage() will work then. Task-number: QTBUG-45902 Change-Id: I900857cfa996924469aaaeeee8037dc84a4fd575 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | | * QMacStyle::styleHint - test pixmap sizesTimur Pocheptsov2016-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | styleHint for SH_FocusFrame_Mask calls drawControl with a painter created for pixmap. We only test pixmapSize.isValid(), but the size (0,0) is also 'isValid', and we end up with a QPainter with an invalid paintEngine (null) crashing in drawControl. Task-number: QTBUG-54630 Change-Id: I84d1785f04ffb3e608812076a6d1bc36ffb92adc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | | | * QCocoaMenuBar: Sync items only when they are attached to a menuGabriel de Dietrich2016-07-131-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another one of Cocoa's capricious behaviors. Evidence shows that the menu item's submenu property needs to be set before we can set the item's hidden property. We ensure this is the case by getting the NSMenuItem through QCocoaMenu::attachedItem() instead of QCocoaMenuBar::nativeItemForMenu() in QCocoaMenuBar::syncMenu(). Change-Id: Id50356dae5f556fa3d745ba9a5982e5a72bf0ac2 Task-number: QTBUG-54637 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Jason Haslam <jason@scitools.com>
| | | | * Mac: Read in the string with QString::fromUtf8() as it is UTF8 encodedAndy Shaw2016-07-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-47358 Change-Id: I50943867d3a57c4db4fe20e55e60d097742e9104 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: jian liang <jianliang79@gmail.com>
| | | | * Set library strip flags on Apple platformsJake Petroules2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in ab599a39313c22fd14cc5466cea5c61bbcdbba8e when QMAKE_STRIP was set as a side effect of adding support for separate debug info. Task-number: QTBUG-54212 Change-Id: I86dd040dbefec4c58879c7d029ed89dd8bad3daf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | | * generalize references to exclusive buildsOswald Buddenhagen2016-07-133-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exclusive_builds_post.prf (via default_post.prf) processes debug_and_release into BUILDS, so .prfs which can rely on being executed later (because they are loaded via CONFIG) can rely on BUILDS and related variables. Change-Id: I5677079ad5145bf493af17b4b60347208572fd21 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | | * remove redundant condition from private module use warningOswald Buddenhagen2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the whole point of the check is ensuring that the message is printed only once for each sub-project, so !build_pass alone is fully adequate. Change-Id: Ib8f821ead6709efc9bfa935e1d05f8caba02a814 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | | | * fix raw data leak in $$absolute_path()Oswald Buddenhagen2016-07-132-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the file name is empty, the path will be returned verbatim. this must be considered when constructing the return value. Task-number: QTBUG-54550 Change-Id: Ie108ed52275e66a154ef63bd6f7193f55b3e0454 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | | * fix calculations of worst-case size requirements for token bufferOswald Buddenhagen2016-07-132-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3aa4c736acec44f95a0a33c7baae9276568f684f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>