summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-2611-11/+0
| | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I5757741166f0f688ce0e8a4e77ed45fd4d72f1c7 Reviewed-by: Martin Smith <martin.smith@digia.com>
* qdoc: Fixed All Classes listMartin Smith2012-10-261-1/+1
| | | | | | | | | | | In Qt5, each class has a URL, so the test for an empty URL fails in findAllClasses(). The test is no longer necessary and is removed. Task number: QTBUG-27695 Change-Id: Id3e7b17c9d68fc59340f88d1300f2a422ad2a18c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-26442-12747/+72429
|\ | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| * Remove Windows as a dependency of mac styleJens Bache-Wiig2012-10-253-46/+103
| | | | | | | | | | | | | | | | | | | | There is not need to have this dependency any more since mac is overriding anything we depend on in Windows style anyway. Change-Id: I8fe0e0cc949265170947b492e04e08fdd4cf5027 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Happy Eyeballs: Make sure that we commit the address type for SSL connectionsJocelyn Turcotte2012-10-251-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _q_connected checks if pendingEncrypt is false before committing the address type. This could be used to delay the commit but nothing is done later in _q_encrypted, so the commit is avoided completely. This causes SSL connections on a network without IPV6 support to hang if the domain name record contains both IPV4 and IPV6 addresses. As SSL is handled a few layers above IP, there should be no reason to avoid/delay committing the address type if the TCP connection was established surccessfully. Thus this patch is removing the check completely. Change-Id: If56a3365f9f51712b4aae3f7902711711ace86fd Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * Remove widget dependencies on Vista style animationsJens Bache-Wiig2012-10-251-329/+350
| | | | | | | | | | | | | | | | This patch will make it possible to get animations on desktop components without using the widget pointer. Change-Id: I2d2eca111dab0d96f276ff3627505c0652c4b4e5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * QTextEngine: Support SMP code points when case changingKonstantin Ritt2012-10-251-4/+16
| | | | | | | | | | | | | | Semi-related to QTBUG-17337 Change-Id: I6b42c0f7e588bbeab27bf410fcdfa1a6f80e4ac2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Remove stale QT_MODULE() usage casesKonstantin Ritt2012-10-2510-19/+0
| | | | | | | | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: I167ccb4c9e92ec9b5e4faeb02bf9c5ef5d982b50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Core/kernel: Make some signals private.Stephen Kelly2012-10-2511-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are more opportunities in QtCore and the rest of Qt to make signals private instead of public. This is a test-dart to see if there is any reason not to do this. It would be nice to make QObject::destroyed private, but as it has a default argument it would be source incompatible to anyone connecting to the SIGNAL(destroyed()) instead of SIGNAL(destroyed(QObject*)). Currently the function-pointer-based connect syntax does not accept a functor (or lambda) with a different number of arguments than the signal. Olivier says a fix for that might come in 5.1, but for now the qfiledialog2 test is changed to not use that anymore. Also, the function pointer for a private signal can not be assigned to a local variable, so the qmetamethod test is changed to not do so anymore. Change-Id: Iaf776b822f9ba364f2c184df0c6b23811da56e44 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Mac: Non-editable QComboBoxes shouldn't get focus by defaultGabriel de Dietrich2012-10-251-1/+19
| | | | | | | | | | | | | | | | | | | | On Mac, only line edits and list views always get tab focus. It's only when we enable full keyboard access that other controls can get tab focus. When it's not editable, a combobox looks like a button, and it behaves as such in this respect. Change-Id: Ia31b0ad01b48a47c1b81180364681d8614863106 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * QStyleAnimation: writable duration & delay propertiesJ-P Nurmi2012-10-252-11/+35
| | | | | | | | | | | | | | These will be needed by upcoming QFadeStyleAnimation and QBlendStyleAnimation. Change-Id: Ibc5092d5dbd834cb9b16353d3e83b95b04d9484b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * QMacStyle: make default button animations independent of QWidgetJ-P Nurmi2012-10-254-115/+65
| | | | | | | | | | Change-Id: I63c078050288e3151a9c6aad5d4ae28a58afd84f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Don't crash if there's no m_image yet.Sérgio Martins2012-10-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | Reproducible with: QBackingStore store( &window ); store.beginPaint(QRect(0,0,500,500)); All other methods already have null pointer checks. Change-Id: Ie278a263760900b58cf4a2ef286deb7f35d50cd0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Implement viewOptions logic in QTableViewPrivate.Stephen Kelly2012-10-252-3/+11
| | | | | | | | | | | | | | | | | | | | | | This is similar to the patch 05aa8c6c12509cce87d1a3811c5ea1dd83fa0898 which was applied to QListView. Task-number: QTBUG-26548 Change-Id: I38ff07230673a93a32b01a7f1951d0378d94185b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Fix crash when handling WM_PAINT during COM operationsMiikka Heikkinen2012-10-254-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | Synchronous expose corrupts painter state if it is done during existing paint operation, which can happen e.g. when requesting some value from dumpcpp generated wrapper inside a slot. Fixed by implementing support for setting asynchronous expose and doing expose according to the setting in handleWmPaint(). Task-number: QTBUG-27209 Change-Id: I89b5aa823fda947d26b1a4757f129e7c31ea408b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fix: don't override the new non-cosmetic default pen in qwidgetaavit2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | As QWidget initializes any painter created in paintevent handler to have the pen color of the palette's foreground, setting it to 0 width, i.e. cosmetic, it negated the effect of the recent change to default 1-width non-cosmetic, ref. I04d910e9700baf7f13a8aac07a3633014bb9283e This caused scaled painting with default pen on QImage and QWidget to yield different results. Change-Id: I930b64bf7c0a8c84b9ea3edb49adc813370fed0e Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Revert hacks in text rendering code pathEskil Abrahamsen Blomfeldt2012-10-256-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of hacks here and there in Qt trying to align the text in a correct way which caused regressions to appear once the default coordinate system changed. We need to remove these hacks to get a more consistent and maintainable base. This also fixes the regression introduced by changing the aliased coordinate system. Task-number: QTBUG-27667 Change-Id: I620db2ca23b7ff6c912f3a51e86e7e36bbef81f0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * QSslSocket: Allow disconnections within the connected() signalJocelyn Turcotte2012-10-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | When doing happy eyeballs style network state lookup, we might have to close an SSL socket from its connected signal. This can cause the warning: QSslSocket::startClientEncryption: cannot start handshake when not connected The signal should be emitted after we called startClientEncryption to avoid this warning. In that case it will initialize the encryption and ramp it down right after. Change-Id: I0c8c79cad7f91f0088b87c5e4ee8aafbc688411c Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * Fix incorrect library path in libEGL.pro.Jason Barron2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | Should not use the QT_INSTALL* variables here since it won't work if we configure with a prefix. Change-Id: I03ac170cb11262c38928f2a0d95e6f243d6d665b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fixed crash on destruction of animating QDockWidget in a QMainWindowRohan McGovern2012-10-252-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make sense to hold an unguarded pointer to a QPropertyAnimation while assigning ownership of that animation to the animated widget. Destruction of the widget while the animation is in progress causes the animation pointer to become dangling; then the widget is removed from the containing QMainWindowLayout, which attempts to abort the animation, dereferencing the invalid pointer. The crash can be reproduced sometimes with tst_QDockWidget::taskQTBUG_2940_resizeAfterUndocking (which is in Qt4 only). Change-Id: I758bf7193b2ea39cd4d8e87197d8ff957d3368eb Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * Fix widget borders when using global stylesheetstyleMiikka Heikkinen2012-10-251-9/+5
| | | | | | | | | | | | | | | | | | | | Recent fixes to stylesheetstyle caused not calling fixupBorder() when globalStyleSheetStyle is used. Task-number: QTBUG-27651 Change-Id: I73263c951e2db7d574e81da3f60a1b79f3852716 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Add DnD support for QNX.Sergio Martins2012-10-252-3/+25
| | | | | | | | | | | | | | | | | | | | We only need DnD within the same application for now, so returning a QSimpleDrag is enough. Change-Id: I842d48f0252f8103fa8632dd3d149ae431658adb Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
| * Add ContextMenu event to QWindowSystemInterfaceMiikka Heikkinen2012-10-2510-2/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | Context menu key wasn't working, as QPA had no handling for it. Added ContextMenu event to QWindowSystemInterface and proper handling to QGuiApplication and QWidgetWindow. Also provide Windows implementation. Task-number: QTBUG-27648 Change-Id: I7ce71ec4b5cdcc7be758e67f9faf6d863f7b19be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Update QDataStream format docs for gui/math3d classesSean Harmer2012-10-251-29/+29
| | | | | | | | | | | | Change-Id: I158d1bc5414f273320f0561000e69c3e06f6ac5a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add ANGLE as a 3rdparty library to Qt.Jason Barron2012-10-24237-1/+67172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANGLE is a component that implements the OpenGL ES 2.0 API on top of DirectX 9. See the following for more info: http://code.google.com/p/angleproject/ ANGLE is now the default configuration on Windows. If you want to use desktop OpenGL, you should build Qt with the following configure options: -opengl desktop To configure Qt to use another OpenGL ES 2 implementation, you should use: -opengl es2 -no-angle Task-number: QTBUG-24207 Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Quieten warning about uninitialized use of d pointerTobias Hunger2012-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | We had this issue in Qt 4 before: Clang considers the use of d uninitialized in the initializer list for d. This might or might not be legal, the clang devs are divided on that topic. Let's just use a more common form and ignore the issue language lawyers. Change-Id: I3324255963a6d0f4a9057fe0d1d9ae868d3efef7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Return invalid datetime when calling addMSecs with invalid QDateTime.Mitch Curtis2012-10-241-0/+7
| | | | | | | | | | | | | | | | | | This is in line with what QTime::addMSecs and QDate::addDays do, for example. Change-Id: I902112486727f74f669a97bde6c42028e0838f8d Reviewed-by: Jon Severinsson <jon@severinsson.net> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Improve QTime test coverage.Mitch Curtis2012-10-241-1/+1
| | | | | | | | | | | | | | Change-Id: If47de3dc047ac4f8a4a1498cf225e03bbbf4110e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Jon Severinsson <jon@severinsson.net>
| * Improve QDate test coverage.Mitch Curtis2012-10-241-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Some statements could not be tested, such as default cases of switches where all possible cases are already handled and some statements where the system locale is used. I also removed some statements that would never be reached and hence will never be able to be covered by tests. Change-Id: I8ea3071f66d942d986e65708732af6751d36b5e3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Clarify assert on use of const char* as TestData type in tests.Mitch Curtis2012-10-241-0/+3
| | | | | | | | | | | | | | | | | | | | Currently all C-style strings used as data types in QTest::addColumn will assert at runtime with, e.g.: "expected data of type 'const char*', got 'QString' for element 0 of data with tab 'blah'". This patch makes it clear that C-style strings are disallowed. Change-Id: Iadbb8f10e16607de95c7adb43d9ff3310aac6738 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * Output leading zeroes for yyyy date formats in QLocale::toString().Mitch Curtis2012-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Converting the date 1 January 0001 to a string in the format "dd MMMM yyyy" currently results in the string "01 January 1", but it should be "01 January 0001". Task-number: QTBUG-27287 Change-Id: Ia025da7343d1c36aaee34c47c6db551a6e89595f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix valgrind warning in QTriangulatingStroker.Friedemann Kleint2012-10-241-1/+4
| | | | | | | | | | | | | | | | Initialize all member variables including m_invScale, which was uninitialized. Change-Id: Id581b1db9411b2f945281e17b7a0407c746761f8 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Add QStyleAnimation::updateTarget()J-P Nurmi2012-10-232-4/+10
| | | | | | | | | | | | | | | | | | For example a paused "default button" animation might want to update the target to get "non-default button" looks meanwhile the animation is paused. Change-Id: Ibb854a40f38a8971e7233b1f34a83056e6a9d827 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix warning about missing return value in XCB native interface.Friedemann Kleint2012-10-231-0/+2
| | | | | | | | | | Change-Id: If311211076c05ed8d0fb62a9ff1129b93a813850 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * QProcess: Include program in destructor warning.Friedemann Kleint2012-10-231-2/+4
| | | | | | | | | | Change-Id: Ib6870d2b161197fdeab7fe5140ac4757c79f478e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * QStyleAnimation: fix threaded renderingJ-P Nurmi2012-10-232-5/+7
| | | | | | | | | | Change-Id: I00875adf2e4b157a3f8b0b99e5280b1275635026 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Blackberry: Fix applicationFilePath() for unpackaged executablesThomas McGuire2012-10-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | Not all executables originate from a BAR package, for example unit tests. Make those use the fallback code for finding the application file path. Change-Id: I5603f329bbe74e37d319ddd190f72bc6f64e1a5c Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix QRegExpValidator::validate docs about the pos parameterGiuseppe D'Angelo2012-10-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code sets it to input.length() iff the regexp doesn't match the string, while the docs say it's *always* set. Therefore, make the docs match what the code does and add a simple test to enforce it. We're not changing the code to match the docs because 1) it's better to stay conservative (we don't want to break existing behaviour); 2) this behaviour mimics what the int/double validators do (they don't move pos at all). Change-Id: I958074558de6b0fc5944101c6535fc7e00442ae9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * CMake: Make qt5_use_modules a macro, not a function.Stephen Kelly2012-10-221-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because qt5_use_modules is a function that does a find package which finds imported targets, things like this: qt5_use_modules(foo Sql) if (TARGET Qt5::Sql) message("Qt5Sql_FOUND: ${Qt5Sql_FOUND}") endif() will show Qt5Sql as being not found, even though the target is in scope. Fix that by making it a macro instead. Change-Id: If314bd5b4d3f769c6c7df5ff2c924eabd16dcc0e Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Fix mistakes in QNetworkAccessManager docs.Mitch Curtis2012-10-221-2/+2
| | | | | | | | | | | | Change-Id: I2c797affec9472815003b1a032196c81088e1df6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * qpa: Fix drawPixmap rendering using CompositionMode_Source in DirectFBJulien Brianceau2012-10-221-1/+3
| | | | | | | | | | | | Change-Id: I646bc7054e1aa17dca4f54ddd3d2668c173773d4 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
| * Remove softkey API, it was only implemented for Symbian.Jan Arve Saether2012-10-222-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only removed from the documentation for now (I think this should go in the beta 2). That should liberate us to be able to change the API if needed for other platforms that might need a soft keys API. Once this goes in, the plan is to do the actual cleanup. Change-Id: I9a7a3eb45597cd013fe3c4bd479ad08a25ef0b9b Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Remove Cleanlooks and PlastiqueJens Bache-Wiig2012-10-2223-10710/+38
| | | | | | | | | | | | | | | | | | We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix clipping and font problems with groupbox in Fusion styleJens Bache-Wiig2012-10-221-10/+14
| | | | | | | | | | | | | | | | | | | | | | The groupbox did not take custom fonts into account when calculating the height of its titlebar. This resulted in clipping issues on Windows. Task-number: QTBUG-27655 Change-Id: I7252bc94d2bbb0731b9dbc1caa6cdd2074fdd7ab Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Make QPen default to 1-width non-cosmetic.Samuel Rødal2012-10-2221-111/+107
| | | | | | | | | | | | | | | | | | | | | | Use the Qt4CompatiblePainting render hint when painting with QPainter to treat default constructed QPens as cosmetic still. The NonCosmeticDefaultPen render hint gets documented as obsolete, since it was in any case not respected by the raster nor OpenGL paint engine. Change-Id: I04d910e9700baf7f13a8aac07a3633014bb9283e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Move some icon code from WindowsStyle to CommonStyleJens Bache-Wiig2012-10-223-456/+456
| | | | | | | | | | | | | | | | | | | | | | Fusion style only depends on CommonStyle and it seems the autotest for tst_QFileSystemModel:iconProvider assumes an icon will be returned from standardPixmap. Since we dont want the icons to depend on style in this case we should move all this to commonstyle. Change-Id: I3a26367e5c0aefe2a39838f0c2cadc4f7afad89d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Delete QWhatsThis() and QToolTip()Marc Mutz2012-10-223-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes are not supposed to be instantiated. QToolTip() already was declared, but not implemented. This patch just adds Q_DECL_EQ_DELETE for better diagnostics on C++11. QWhatsThis() was implemented, but appears to be unused. Since it was private to begin with, successfully compiling QtWidgets is a sufficient test. Change-Id: I698ece8f0eebbcdac7be98456dd42197b758a825 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * QDateTimeEdit: don't throw off auto-indentionMarc Mutz2012-10-221-3/+2
| | | | | | | | | | | | | | | | Reformulate #ifdef'ery involving {}s so as not to throw off auto-indention of code editors due to unbalanced {}s. Change-Id: I0f9858c78d0b6d923de75ca45c7d65ce3fa53e50 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Trim trailing whitespace.Stephen Kelly2012-10-225-35/+35
| | | | | | | | | | Change-Id: Iee6bb66831f53399e5937eab5704af835979f5c3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix integer overflow in QSpinBox.Stephen Kelly2012-10-221-2/+17
| | | | | | | | | | Change-Id: Ic204d42fbdffc44576f7e76132bc53621e836299 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>