summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove references to $$QMAKE_CYGWIN_EXEOswald Buddenhagen2015-10-012-3/+0
| | | | | | | | | it would cause the unix generator to set TARGET_EXT, but that wasn't used anywhere. so remove the dead code. if it ever gets re-introduced, it will be as QMAKE_EXTENSION_EXE. Change-Id: I44ce3e612651fd229177e37ab6c8879cd8c474b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* inline NmakeMakefileGenerator::getPdbTarget()Oswald Buddenhagen2015-10-012-7/+1
| | | | | | | it was used only once, and virtual for no reason whatsoever. Change-Id: I99411be3dac93d8a129441f656b2443d09108564 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove support for {rvct,arm,ti}_linkerOswald Buddenhagen2015-10-012-61/+12
| | | | | | | | rvct and armcc support are remnants from symbian, while the ti linker support was never completed in the first place. Change-Id: I5c9d7f0ce67de24c348cbee4af618a499fe06f16 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove unsupported linux-armcc specOswald Buddenhagen2015-10-013-165/+0
| | | | | | | | it was experimentally added in 2011. there is no evidence that anyone actually uses it. Change-Id: Ie3b131f3783cafe942d180b2623fcc64740d7a73 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove overuse of trimmed()Oswald Buddenhagen2015-10-014-10/+9
| | | | | | | | there is no reason to expect the various list elements to be space-encumbered, or to tolerate it if they were. Change-Id: I1a2e5c8d30456b640408503334c55f9262792db5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* de-duplicate calculation of target baseOswald Buddenhagen2015-10-011-6/+7
| | | | | Change-Id: I546fe454f925dd9ad39ba444fa78455c8dbdfde6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* don't support arbitrary flags in LIBS on windowsOswald Buddenhagen2015-10-011-8/+5
| | | | | | | | | | | | | | | | there should be no flags other than /LIBPATH: in LIBS (and the variables that end up in it) - these belong into QMAKE_LFLAGS. while not very important, this change enables the use of drive-relative paths using unix path separators. note that on unix, arbitrary flags must be supported in LIBS due to GNU ld's --push-state and related position-dependent flags (-whole-archive in particular). luckily, on unix, flags start with a dash, not a slash. Started-by: Dyami Caliri <dyami@dragonframe.com> Change-Id: Ie5764f14d34ad13020ca010499594eed8c69a4a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* don't overquote library pathOswald Buddenhagen2015-10-011-1/+1
| | | | | Change-Id: I33b91141c79cacd1a46299754937c81a31e665c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix configure bootstrap on mingw with spaces in the builddirOswald Buddenhagen2015-10-011-1/+1
| | | | | | | the missing quotes would cause us to misdetect mingw as msys. Change-Id: I408c0e6bfc3cbfecd02c54904cf96ab79e0b6d88 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* omit trailing /. from relative RPATHs pointing to own directoryOswald Buddenhagen2015-10-011-2/+8
| | | | | Change-Id: Ia4551f5b16f4e66c7ab7fdec82643d9cd8866ccd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix place of "qnx" in $$QMAKE_PLATFORMOswald Buddenhagen2015-10-011-1/+1
| | | | | | | | | | it must come first, as it is most specific. an alternative fix would be re-organizing the includes, but that requires a lot more effort to get right. Change-Id: I1526a3c966f3dc3f3df1efc00ec271d333ed7ebf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* more accurate check for presence of target INSTALLOswald Buddenhagen2015-10-011-1/+2
| | | | | | | make it match qmake's own rules. Change-Id: Ia6b9ac12ac08932ac67f100f4638352a214553bd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* "frame" execution of config tests preciselyOswald Buddenhagen2015-10-012-1/+9
| | | | | | | | | the purpose is to make build log parsers able to ignore build failures in verbose configure output. Change-Id: I01af2e019fd1b055fdfcf6749faeebacb7a39c3f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clean up debug code and unused functions from imagegestures exampleJoni Poikelin2015-10-013-4/+0
| | | | | Change-Id: I0dbbb5c6f3227e8cfe3e0f6eb27b2bf16b5d222b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Purge extraneous execute permissions.Edward Welbourne2015-09-304-0/+0
| | | | | | | | | Source files should not be executable. Change-Id: If9b9eaa6c8c7348ca6f48fa9253f3540e95aca37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Fix a #! first line.Edward Welbourne2015-09-301-1/+1
| | | | | | | | An executable .sh file should have its #! be the first two bytes. Change-Id: I22c9eee6d349df743b02996bef0e093df3f42eb5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Moved a comment to where it belongs.Edward Welbourne2015-09-301-9/+8
| | | | | | | | There was another function between the comment and the one it documented. Change-Id: I4e96979261738b1ef264984da0d6a8245f2fb643 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Improve tst_qfile.Friedemann Kleint2015-09-301-114/+170
| | | | | | | | | | | | | | | - Introduce consistent error messages for failing QFile::open() and existence checks to make errors about non-available UNC paths on Windows clearer. - Introduce a guard class to ensure the stdin reader processes are terminated properly in case of failures, which currently occur for MSVC2015. - Fix brace coding style and remove unnecessary QString conversions. Task-number: QTBUG-48504 Change-Id: I890b13088558ef05391fb152a6b815276df0fe8c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Improve messages in tst_qdir/tst_fileinfo/tst_qfiledialog2.Friedemann Kleint2015-09-303-56/+111
| | | | | | | | | | Introduce error messages showing the path in file existence, file type and directory entry list tests to make fails related to missing UNC shares clearer. Task-number: QTBUG-48504 Change-Id: I5fb401b94cfa8b58562a906b8d9765039e334027 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Don't include <windows.h> in the MinGW qplatformdefs.hThiago Macieira2015-09-301-1/+0
| | | | | | | | | | There's no need for it and there's harm in doing so, as it #defines "interface". Task-number: QTBUG-48351 Change-Id: I4ca855441b899f3f723a12f673645f3ce7541d9b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Initialize QFutureWatcherBasePrivate::finished and testEdward Welbourne2015-09-302-3/+17
| | | | | | | | | | | | | | It's accessed by QFutureWatcherBase::isFinished(), potentially before anything has set it. It gets to be initially true until setFuture() has given it us unfinished future and set it false. Add a regression test for matching state in future and watcher. Task-number: QTBUG-12358 Change-Id: Iae7bdaa434ab80f518afe4d7d55df99c391991a4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* MSVC2015: Blacklist tests reading from stdin in buffered/text mode.Friedemann Kleint2015-09-302-0/+8
| | | | | | | | | | | | | | - tst_QProcess::fileWriterProcess() - tst_QProcess::readLineStdin() - [tst_QProcess::readLineStdin_lineByLine() The test fails apparently due to a bug in its runtime library (fread() dropping data). Task-number: QTBUG-48455 Task-number: QTBUG-48504 Change-Id: I972e560e88312cea0d3dbcea9450c59285a15d5a Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Clean unused parameter warning from QItemSelectionModel testJoni Poikelin2015-09-301-1/+1
| | | | | Change-Id: I6bd40e8de7b44630ef5c7475b8159ab9a0361cb9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Add qt_safe_ftok wrapper for ftokLouai Al-Khanji2015-09-303-2/+16
| | | | | | | | | | | | | | | | The ftok function unfortunately can return duplicate keys even for different files if the same project id is used. This is discussed e.g. in Stevens' "Advanced Programming in the UNIX Environment". We want the key to be predictable so we cannot just pass a random number as the project id. To reduce the propability of key collisions we hash the file name with the project number as seed for a predictable value. This is the same approach taken e.g. by Apache, but the real fix is to move away from System V IPC completely once this is feasible on our supported platforms. Task-number: QTBUG-48375 Change-Id: If1a57f215f7ddd147aa38919907cfb83db07aea0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix for platform socklen_t on other C libraries than glibc.Dave Flogeras2015-09-301-3/+3
| | | | | | | | | | | | | Rather than treating >=glibc-2 specially, we treat <glibc-2 specially and all other libc implementations as POSIX. This was found here http://patchwork.openembedded.org/patch/94947/ and tested with armv6j-hardfloat-linux-uclibceabi and armv6j-hardfloat-linux-musleabi. Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unused font deployment featureAndrew Knight2015-09-301-62/+0
| | | | | | | | This is a leftover from the unsupported Windows Phone 8.0 mkspec. Change-Id: Ibcf11e131a3cb098960410dbd683eb5950b0c5ad Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* qwindowsmime compilation fixVyacheslav Koscheev2015-09-301-1/+5
| | | | | Change-Id: I6ca030ed1333f62da6270c1295a4f489f088334d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* uic/class_lib_map.h: Fix include path of QValidator-derived classes.Friedemann Kleint2015-09-301-4/+4
| | | | | | Task-number: QTBUG-48492 Change-Id: I1b43bd955cdb36c564483dfa3d9b416885ada983 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* tst_qprocess: Improve handling of helpers.Friedemann Kleint2015-09-304-17/+99
| | | | | | | | | | | Verify exit status and code where applicable. Avoid unnecessary data conversions in fileWriterProcess. Improve error handling in helper processes. Task-number: QTBUG-47370 Task-number: QTBUG-48455 Change-Id: Ib5c4f546027131db02caaa05154a5880edac5cf7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Skip tst_QNumeric::addOverflow() for MSVC2015.Friedemann Kleint2015-09-301-2/+2
| | | | | | | | The code still produces Internal Compiler Errors in release mode. Task-number: QTBUG-46344 Change-Id: I86d3608b13a197a0b65b83829d1512203e1578f8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* QTestLib: Add MSVC 2015 to blacklist.Friedemann Kleint2015-09-291-1/+3
| | | | | | Task-number: QTBUG-48455 Change-Id: I8ea322f393a1f8d44183892f20e5461d571bc4c0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* winrt: Default show to showMaximized on Windows Phone.Samuel Nevala2015-09-281-2/+2
| | | | | | | | | | | | | | Status bar visibility can be controlled and window geometry can be adjusted accordingly. Default show to showMaximized instead of showFullScreen. This means that by default application starts status bar visible. [ChangeLog][winphone][Important Behavioral Changes] By default application starts status bar visible. Task-Id: QTBUG-48282 Change-Id: Ia60edd53ec2a7181aa97d21a825600b7c8cf87a7 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* QFSFileEngine: Remove unused memberThiago Macieira2015-09-281-1/+0
| | | | | Change-Id: I42e7ef1a481840699a8dffff1407ebea9c7cb423 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix sign-extensionThiago Macieira2015-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | If data[0] were > 128 (that is, if the full size, encoded in big endian were > 2 GB), the result of the OR chain would be a negative int (due to C integer promotion rules). We're shifting into the sign bit, which is either implementation-defined behavior or, worse, undefined behavior. This negative number is then sign-extended to ulong (64-bit on 64-bit platforms), which then becomes a big number. This code was probably written with only 32-bit in mind, where there would be no size extension (sign or otherwise). This isn't too bad because there's a size check for the max size of QByteArray a few lines below, but we can fix it, so let's do it. Found by Coverity, CID 22530. Change-Id: I42e7ef1a481840699a8dffff1407ea6c22e1a0ec Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Remove unnecessary null-pointer checkThiago Macieira2015-09-281-2/+1
| | | | | | | | | | It was dereferenced 8 lines before and the pointer cannot have changed since. Found by Coverity, CID 11363. Change-Id: I42e7ef1a481840699a8dffff1407ecab4e4f5930 Reviewed-by: Richard J. Moore <rich@kde.org>
* QUrl::setPort: use the original port number in the error messageThiago Macieira2015-09-281-1/+1
| | | | | | | Otherwise the error message will always say -1. Change-Id: I42e7ef1a481840699a8dffff1407eceec1906254 Reviewed-by: David Faure <david.faure@kdab.com>
* eglfs_kms: Skip disconnected outputsPier Luigi Fiorini2015-09-281-0/+6
| | | | | | | | | | For some reason VMware reports 8 outputs, 7 of them are disconnected and so they cause several errors. Skip disconnected outputs to avoid those errors. Change-Id: I5f9fa2ef38b916af9f9ae8b50fce9fc40c18bff3 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* eglfs_kms: Subpixel antialiasing typePier Luigi Fiorini2015-09-283-0/+22
| | | | | | | [ChangeLog][QPA][eglfs][kms] Provide subpixel antialiasing type. Change-Id: I1eed487cea675d988a128f63a9d5c2c0ddeae21f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Tests: Always verify whether QTemporaryDir/File creation succeeded.Friedemann Kleint2015-09-2824-53/+75
| | | | | | | | | | | Use QVERIFY2() with QTemporaryDir/File::errorString() consistently. Attempt to catch issues like the below warning and follow-up issues. QSYSTEM: tst_QFiledialog::clearLineEdit() QFileSystemWatcher: FindNextChangeNotification failed for "C:\Users\qt\_____aaaaaaaaaaaaaaaaaaaaaa" (Access is denied.) Task-number: QTBUG-47370 Change-Id: I58a6e87c502627e976efa62ad73c912f3b2d49fa Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* QLockFile: sync to disk to avoid leaving an empty lock file on crashDavid Faure2015-09-281-0/+7
| | | | | | | | | | | | The two lines of code are the same as in QFSFileEnginePrivate::nativeSyncToDisk, but we don't want to create a fileengine instance just for this. qlockfile_win.cpp already calls FlushFileBuffers, only the Unix implementation was missing the equivalent call. Task-number: QTBUG-44771 Change-Id: I2253972857e4de9d27ef442c92983a1088d6f03e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: minor link issue in qtbaseNico Vertriest2015-09-281-1/+1
| | | | | | Task-number: QTBUG-43810 Change-Id: I018c25146e6be3fa2c9dfffbdc9bd71738aefcc2 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Clean up cancel operation handling on OS XTor Arne Vestbø2015-09-2723-101/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic for handling cancel operations was spread out through the code base and sometimes hard-coded to only include the Escape key shortcut, missing the Command+. shortcut. We now intercept both attempts at cancel operations from the system through cancelOperation, which we forward as normal key events. A new QKeySequence::StandardKey has been added for the Cancel sequence, which maps to Escape on all platforms, and Command+. in addition for OS X. The hard-coded logic in QWidget and subclasses for dealing with closing the dialogs has been replaced with this key sequence, which allows clients to override the behavior. Note that the widget code is not wrapped in checks for QT_NO_SHORTCUT, as we don't care about keeping widgets building and working under that define. The logic in QCocoaWindow to bypass windowShouldClose when delivering IM events has been removed as we now handle that specific case by also forwarding Escape as a cancel operation. Task-number: QTBUG-47557 Task-number: QTBUG-45771 Task-number: QTBUG-44076 Change-Id: Ibe0b3a4819f8659d246a2142dd7d9cd3a826ef78 Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Enable tst_qaccessibilitylinuxFrederik Gladhorn2015-09-262-12/+25
| | | | | | | | | | | | | | | | This test caused problems because it relies on the at-spi services to run. In addition it could trigger orca (screen reader) to be launched as a side-effect of the dbus call to the screen-reader-enabled setting. Instead just export QT_LINUX_ACCESSIBILITY_ALWAYS_ON to make sure that accessibility will work. This means we won't test the dbus startup any more, but the test will be reliable. There is still a dbus call to org.a11y.Bus to launch the service in case it's not running yet. Task-number: QTBUG-27732 Task-number: QTBUG-44434 Change-Id: Idb86ed98ca4b47cb209027c8b41529e7e5285197 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Fix ICC warning about use of "defined" in a macroThiago Macieira2015-09-251-1/+1
| | | | | | | qhash.cpp(89): warning #3199: "defined" is always false in a macro expansion in Microsoft mode Change-Id: I7de033f80b0e4431b7f1ffff13fc960bcbb17352 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Work around GCC thinking that a variable could be clobbered by longjmpThiago Macieira2015-09-251-0/+1
| | | | | | | | | | | It can't be. The block in which the variable "s" exists makes no call to any function that takes the setjmp buffer. This is not a false positive warning: it's an incorrect warning. qjpeghandler.cpp:878:6: error: variable ‘s’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] Change-Id: I42e7ef1a481840699a8dffff140681a3d7e34493 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Remove QT_WARNING_DISABLE_GCC for ClangThiago Macieira2015-09-251-1/+1
| | | | | | | | There's QT_WARNING_DISABLE_CLANG for when a warning applies to a Clang build. Change-Id: I42e7ef1a481840699a8dffff1406ac36b6a6eac3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* tst_qprocess: Instantiate QProcess objects on the stack.Friedemann Kleint2015-09-251-165/+141
| | | | | | | | | | | | Instantiate the QProcess object on the stack to ensure resource cleanup and remove the QProcess * member variable. Use qobject_cast<QProcess *>(QObject::sender()) instead of the member variable in the helpers slots to ensure that signals from a leaked QProcess do not interfere with other tests. Task-number: QTBUG-47370 Change-Id: Ifc0dccb7e4b18069d236df53bccdcb6a47df6346 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* tst_qprocess: Port to Qt 5 connection syntax.Friedemann Kleint2015-09-251-46/+54
| | | | | | Task-number: QTBUG-47370 Change-Id: I09489a6fb4598238fa5e0120bf751fe5af6f31af Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Qt IBus plugin connects to IBus Bus again if ibus-daemon does not runTakao Fujiwara2015-09-252-17/+97
| | | | | | | | | | | | Qt5 applications do not enable IBus when the applications are saved in the session and launched automatically in the next login. This patch checks the IBus socket path and connect to the bus when it's available. Task-number QTBUG-47657 Change-Id: I0883eaa2438fd27455da93f78f392ea3c1abe6b8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Remove wrong forward declarationOlivier Goffart2015-09-251-1/+0
| | | | | | | It confuses auto complete Change-Id: Ida86f6c8dcca351339d2b41ad40cf5701f5bb2c4 Reviewed-by: Richard J. Moore <rich@kde.org>