summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QMessageBox - add message box to (manual) dialog testThorbjørn Martsum2013-06-214-2/+262
| | | | | | Change-Id: Ib5641a60a582517459d256fbd3537df4395bcd26 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* GTK-style - fix non-standard usage of QHash-iteratorThorbjørn Martsum2013-06-211-1/+2
| | | | | | | | | | | | | Even if it currently works it is highly non standard to modify (incl. free/delete) the key for the iterator and then use it afterwards. The current code prevents a merge of a patch that uses the key to check if the iterator is valid. Change-Id: Ia89553ea4ba53e24488a6bfe06b8d7d0e351c1ea Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Generate the directory for the mkspec include in a helper file.Stephen Kelly2013-06-216-18/+41
| | | | | | | | | | The cmake variable for the mkspec dir must specify the source location if used in the build dir, and must specify the install location if used in the install dir. Change-Id: I2fee8cd0c7198e9fc5cbb63972e20c75636672d1 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* HTTP internals: consider SSL sockets with pending encryption as usablePeter Hartmann2013-06-182-1/+6
| | | | | | | | | | | | | | | We do not decide which socket a HTTP request is sent on until the socket is actually ready for sending a request (i.e. it is connected for HTTP requests and encryption is done for HTTPS requests). When deciding how many sockets we need for the queued requests, we consider an in-flight socket as free if it is still connecting. However, we considered a socket that was connected but needed to complete encryption as busy, and would instead open another socket. Now, we consider an encrypting socket as in-flight as well. Change-Id: I93d6743da6fc430d1424c6965e1475865fd97243 Reviewed-by: Richard J. Moore <rich@kde.org>
* create a sub-tools targetOswald Buddenhagen2013-06-171-0/+6
| | | | | | | | for testing only. Change-Id: I8ed63df9351bc40bbbbecd02489537a2daff768f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix roundtrip conversion of datetimes.Mitch Curtis2013-06-172-4/+22
| | | | | | | | | | | | | | | | QDateTime.toString() is writing out milliseconds since change 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c. Unfortunately this breaks QDateTime::fromString() with Qt::TextDate which can't handle the new format. Fix by making QDateTime::fromString split up seconds and milliseconds on a period, if any. Now QDateTime dt = ...; assert(QDateTime::fromString(dt.toString(), Qt::TextDate) == dt) works again. Change-Id: Ibfe9032e357ceaf894e33f3e33affe94f56dbf5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QNX: Replaced physical screen size warningBernd Weimer2013-06-171-4/+11
| | | | | | | | | | On stock QNX it is quite common that libscreen doesn't provide the physical screen size. The warning about this has been replaced with a debug statement, because it was annoying especially when running auto tests. Change-Id: Iab07f0d4a6293c40678f2ec3e77352e68797c8c7 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Manual test: fix compilation with namespaced QtDavid Faure2013-06-144-0/+8
| | | | | Change-Id: I098bf2ec123e1b49fd04df5cea6fb7d5b1b62cfb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Correct implementation of nested runloop to match UIApplicationMain()Ian Dean2013-06-131-6/+40
| | | | | | | | | | | | The previous implementation of the nested runloop was derived from the Mac Cocoa implementation(?), and did not correctly deal with UI animations and other UIKit functions which are run in a different mode to the default mode. This version corrects that (in most cases) and switches the implementation to use CoreFoundation instead of NextStep APIs. Change-Id: I45802d22044465749a1e5b6207d745268f6ae8a1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Move iOS event dispatcher from platform plugin to platform support.Ian Dean2013-06-135-5/+10
| | | | | | | | Move iOS event dispatcher from platform plugin to platform support, so that it can be used by multiple iOS platform plugins. Change-Id: I9041b2de5e00e5fe8f30af2dfd922b4f5c594802 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-13156-557/+1302
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-12156-557/+1302
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| | * don't touch deprecated headers unless they actually changeOswald Buddenhagen2013-06-121-22/+25
| | | | | | | | | | | | | | | Change-Id: Iabeec90c2a6549cf92b3b8369a41764a576fd0aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * purge dead uic class map code.Oswald Buddenhagen2013-06-121-21/+0
| | | | | | | | | | | | | | | Change-Id: I9b67924a66c847cd4cf2ce9f2996017ae7eb61a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * remove unused symlinkFile() functionOswald Buddenhagen2013-06-121-30/+0
| | | | | | | | | | | | | | | Change-Id: Ie235fe65020ed7c4870d9c8784a181bf880b9e28 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't make qconfig.h read-onlyOswald Buddenhagen2013-06-121-3/+1
| | | | | | | | | | | | | | | | | | | | | not much point in it, really. Change-Id: If984aa137993ae6b95cb3591fceac729ae3aa819 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Windows: Prevent spurious leave events.Sebastian Eifert2013-06-122-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When behind a mouse-event-transparent window, synthesized leave events are emitted, because the transparent window is considered as the window under the mouse, not the Qt window. This change skips transparent windows when searching for the window under the mouse. Task-number: QTBUG-31464 Change-Id: I85c8b46a1af37b4d1c5d1d77566ab045657aa9ae Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * QDockWidget: Keep position when undocking.Friedemann Kleint2013-06-122-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Initialize undockedGeometry to roughly the current position. Task-number: QTBUG-31044 Change-Id: I03cbe280d1215bb58ab721b60e29b45359cde76d Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| | * Mark the Q_DECLARE_OPAQUE_POINTER macro as introduced in 5.0Laszlo Papp2013-06-121-0/+1
| | | | | | | | | | | | | | | Change-Id: Ida52c9f1f72b628d9a7faaf7998798e781b53df2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Xcode: Don't set TARGET_BUILD_DIR; that's handled by a copy phaseTor Arne Vestbø2013-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts an earlier change that tried to fix the relationship between Qt's concept of output directories with what Xcode expects, but it broke DESTDIR. The relationship between Qt and Xcode is still a mess, but at least DESTDIR now works. Change-Id: I44f056d48c87359a609e0337da266120ba4eb155 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| | * doc: QOpenGLFramebufferObject::bindDefault() was marked internalMartin Smith2013-06-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The \internal was removed. Task-number: QTBUG-31645 Change-Id: I98b57ec3816b6d9c49e3488accb65f147aeb15f1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: qdoc was confused by namespace and module with same nameMartin Smith2013-06-117-44/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qdoc searched for QtConncurrent::blockingFilter(), it found the module node for QtConcurrent instead of the namespace. This was because qdoc wasn't given specific enough instructions on how to perform the search. Now it searches for the namespace first, then the C++ class, then the module. Task-number: QTBUG-31535 Change-Id: I4f8aec503903508789738f2a77c76f47a3e80a93 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Improve error output when platform plugin cannot be loadedKai Koehne2013-06-111-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgetting to deploy the platform plugin, or deploying it to the wrong folder, is a common mistake. The old error message didn't made it however explicit what was happening. Make the log more verbose, and explicitly state that the missing plugin is the reason for termination. Change-Id: I810a0ef8da5f8e898e7e0c6f853972514a05c75d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix leak in QCocoaDrag.Ivan Komissarov2013-06-111-1/+3
| | | | | | | | | | | | | | | Change-Id: I2961d08f95c68446a2893721dc79ba56bf98c0de Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * When the file could not be accessed, we should return 0 for the sizeAndy Shaw2013-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions rely on the size to be sure that the file can be read from. Therefore when nativeSize() fails to access the file we should return 0 instead of a random size to prevent these functions from acting as if there is a valid file to read from. Task-number: QTBUG-31571 Change-Id: I589fc199760ba40ef2e63047b2f226cb196f7e56 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | * The SingleClickActivation setting was wired to the wrong platform settingRobert Griebl2013-06-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I24dacd6d6cbc22eaf29dc09a6f59bf4ee7d48f37 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-1013-104/+98
| | |\ | | | | | | | | | | | | refs/staging/stable
| | | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-1013-104/+98
| | | |\ | | | | | | | | | | | | | | | Change-Id: I89c251999ae2a82522b40471fd13f2e06b00ece8
| | | | * QEventLoop: Remove the test that checked throwing from an event handlerThiago Macieira2013-06-081-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 5, we declared that throwing from event handlers is undefined behavior. So stop testing this. We will try our best to capture and pass along std::bad_alloc, but even that might not work, depending on compiler settings. In particular, after the upgrade to MinGW/GCC 4.8 with DW2, this test stopped working. Task-number: QTBUG-31615 Change-Id: Ibf5fb2ce0c48b983549096bf7aac434b6ed3ac2e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | | * test: Mark tst_qopengl as insignificant on Win7 + AngleSergio Ahumada2013-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only marks tst_qopengl as insignificant on Windows 7 32bit with the Angle configuration. Task-number: QTBUG-31611 Change-Id: I1876b6fdc32fef93edf34c2bd61d03cc9ba11135 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| | | | * RecalcAdvances and DoKerning should agree on when to use design metricsAllan Sandfeld Jensen2013-06-072-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontEngineFT::recalcAdvances uses design metrics if hinting is disabled or slight. QFontEngine::doKerning only follows the QFontEngine::DesignMetrics flag. This means in some instances the advances will be calculated in subpixels but kerned in full pixels. This patch makes QFontEngineFT decide if it should request design metrics from QFontEngine::doKerning or not. Change-Id: Ia0236efde2d7269623f690a6074afbe26e07c458 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| | | | * Windows: Send a geometry change after Window creation.Friedemann Kleint2013-06-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30996 Change-Id: I03b5e1fdbbdd779f86541291c13e9eb6840ff3c6 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | | | * Use QWindow::geometry() for size when sending resize before expose.Friedemann Kleint2013-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30996 Change-Id: I9c3589ea67b563f6e588568ee54cc8bbd084f87c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | | | * Doc: Fixed typo in QDialog.Jerome Pasion2013-06-071-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31493 Change-Id: I7bb7b249a0336dd949f8c74bcc22c0b7c39d0885 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | | | * Doc: Rearranged page titles in the <head> of HTML pages.Jerome Pasion2013-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: <title>QtMultimedia 5.1: Camera</title> After: <title>Camera | QtMultimedia 5.1</title> "Camera" is page name and "QtMultimedia 5.1" is the assembled project name. -Regular page title is the same. -It's a readability issue to not see the page title right away -New arrangement conforms to Qt Project and blog name format: "<Title> | <Domain>" -Tested with the tw-parser and it looks compatible with the qt-project.org site Change-Id: Iae0eec9e66b5e21285bdad1e525923f60c72e56b Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | | | * Cocoa:Fixed crash when sharing QMenu between two QMenuBar instancesRomain Perier2013-06-074-22/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't insert a NSMenuItem into a NSMenu if this one already belongs to another NSMenu, this is forbidden in the Cocoa framework and raises an Exception. The solution consists in tagging the menu as sharable and moving it from one menubar to another when the window gets focus. Task-number: QTBUG-31342 Change-Id: Ic3bfadd4704f363ac26122ae15547543a0f6d44d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | | | * Strip the -L dirs when processing GL dirs for the CMake files.Stephen Kelly2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated cmake files expect only the names of libraries, so the existence of directories causes erroneous fatal errors when attempting to use Qt5Gui, if pkg-config returns a -L entry from pkg-config --libs egl Change-Id: Iec50b4be68ab643c3c02abce2435a98e69955138 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * | | Add QMAKE_NM to the mkspecsThiago Macieira2013-06-1063-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll use nm to get the listing of symbols in the next commit. The -P option is "portable", which sounds like a good idea. I don't have access to any of the commercial Unix systems, but I do remember them printing a different format than GNU binutils's nm. Change-Id: If6f80624bedaf2b1dabf608e16aa097d9910d739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | | Add objcopy to MinGW's mkspecThiago Macieira2013-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03442f65e281751c8353eca8b987026e9be2437f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | | BlackBerry: fix tst_QLocale::emptyCtor()Rafael Roquetto2013-06-102-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BlackBerry OS does not allow for explicitly controlling the locale through the "LANG" environment variable. Locale is controlled by the underlying PPS Service instead. Change-Id: I22154e39f81a9467ad7fdb90a042396390398b1b Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
| | * | | Q_DISABLE_COPY doesn't need a ; at the endAlbert Astals Cid2013-06-103-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes warnings when -Wpedantic is enabled Change-Id: I8fcfbfa9bb3a5ab61c85f8cb74660f6f7e459fc0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| | * | tst_QUrl: check that prohibited characters in hostnames are not validThiago Macieira2013-06-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_nameprep is tested by tst_qurlinternal. We just need to be sure that QUrl handles them correctly. Change-Id: Ic563004870d2cf2fa7a31ce49fff7280d5ffb5f3 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| | * | tst_qfilesystemmodel: Fix warnings about comparing int/bool.Friedemann Kleint2013-06-081-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4804: '<=' : unsafe use of type 'bool' in operation Remove outer loop and replace ugly ROW_NAME macro by inline function. Change-Id: Id7e4ef047adaf8017b8c21621d19c151993cc6dd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | tst_qmessageauthenticationcode: Fix warning about character conversion.Friedemann Kleint2013-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4309: 'argument' : truncation of constant value. Change-Id: I54e9b515d065c1a89bf790fb214c335e852ce5ac Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | tst_qguivariant: Fix warnings about double / float conversion.Friedemann Kleint2013-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4305: 'argument' : truncation from 'double ' to 'float' Change-Id: If9bf2f79592d305e767d2a8c38e577c5dff51129 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | tst_qdom: Fix warning about character conversion,Friedemann Kleint2013-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4309: 'argument' : truncation of constant value. Change-Id: I04262dcb71b916abeab27e7b8bc2ca6c875794d2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | tst_qglthreads: Fix warnings about unused variables.Friedemann Kleint2013-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6bc95e8335474753d6506db5e8119710797f4f1b Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | QtCore: Fix MSVC-64 warnings about integer truncation.Friedemann Kleint2013-06-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4267: 'argument' : conversion from 'size_t' to ' int', possible loss of data. Change-Id: I79af7497420d468b5bc7c48c9ae21b86117519a9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * | tst_qjson: Fix MSVC C4293 warning about shift operation.Friedemann Kleint2013-06-081-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning C4293: '<<' : shift count negative or too big, undefined behavior. Change-Id: I858dd08f16ea0e00f2384491fc735b7367c6925d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | code cleanup. make one way to access system dbus. remove dead uncommented codeLorn Potter2013-06-081-27/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia53cdc27f354269bb393ac137802b8807652cef9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 12:27:48 +0000