summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix widget leak in tst_qmainwindow.Friedemann Kleint2014-11-201-0/+8
| | | | | | Task-number: QTBUG-38152 Change-Id: I4cf94a4a8977019dcfc099966643b5b036cc1021 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* QtBearer networkmanager make sure to set flag ActiveLorn Potter2014-11-207-103/+263
| | | | | | | | | | | Also, no need to create objects to get properties, when the properties can be had for free. Make plugin more robust to network-manager or ofono crashes Change-Id: Ibadb46bd51aa27f130f8d245e8c50aa7bff5f9c8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
* Ignore nodes with no text name, value and description.Jan Arve Sæther2014-11-201-1/+1
| | | | | | | | | | This is in order to skip certain nodes that usually only carry structural information (such as ListItem nodes). However, because of the flattening, this structural information is never used on iOS, so we can just skip the accessible node completely. Change-Id: I17018c6565f8b39831f2d2944422c6670a438ab9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Do not skip the parent node when flattening the hierarchy.Jan Arve Sæther2014-11-201-6/+3
| | | | | | | | | The weather app had a search field with a clear button as a child. Because of this bug it didn't report the content of the text edit (but only the clear button) Change-Id: I174c6e150e1991fa9aa2a911048590030b5ccc40 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Observe QLocale::RejectGroupSeparator in QInt/DoubleValidator.Friedemann Kleint2014-11-204-15/+30
| | | | | | | | Pass it as additional boolean parameter to QLocaleData::validateChars(). Task-number: QTBUG-42522 Change-Id: I4b2367f4e2fdcbd17e343d215edad57e6687697a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Pick up QT_LOGGING_RULES also for bootstrapped toolsKai Koehne2014-11-201-2/+0
| | | | | | | | | | Pick up logging rules set by QT_LOGGING_CONF, QT_LOGGING_RULES, and qtlogging.ini file also for bootstrapped tools. This helps e.g. in the case of winrtrunner, which uses categorized logging. Change-Id: I47d392137e17a59cb57b5c0226f282b0ccf29961 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Use single finger pan to scroll text edits on touch screens.Friedemann Kleint2014-11-201-2/+21
| | | | | | | | | Change the number of pan points to 1 for these classes as a workaround until pan/tap gestures are fully fixed. Task-number: QTBUG-40461 Change-Id: I0d68726a545ee6148f3ab88f2ab7308b10464ecd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QWidgetTextControl: Suppress drag selection for OS-synthesized mouse events.Friedemann Kleint2014-11-203-1/+35
| | | | | | | | | | Add a convenience function to QApplicationPrivate returning the source of mouse events to be able to detect synthesized mouse events. Change-Id: I09f82ed917586cd3de8b4146fc6638d19d428163 Task-number: QTBUG-40461 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix QString::section() behavior on negative and out-of-range indexesAlex Trotsenko2014-11-202-18/+61
| | | | | Change-Id: I3bff6ba73b15ee810bb11b2902d11244c3205b2a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Text editors: Prevent autoscroll timer triggering from synth mouse eventsFriedemann Kleint2014-11-202-12/+16
| | | | | | | | | | The autoscrolling interferes with scrolling pan gestures and causes the scroll direction to be reversed when moving outside the window. Task-number: QTBUG-40461 Change-Id: I30ef848a346418929540c23730ab92f44e4565e2 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix how qsocks5socketengine autotests are blacklistedTony Sarajärvi2014-11-201-0/+2
| | | | | Change-Id: I6436491267b737fc00c33af7bd9491510c21b7c5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* fix how qnetworkreply autotests are blacklistedTony Sarajärvi2014-11-201-0/+2
| | | | | Change-Id: Id5b0ec07504020f246e57d3ad57ffd5ce0be61ab Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Allow empty string as intermediate matchPaul Olav Tvete2014-11-202-1/+4
| | | | | | | | | | | QRegularExpressionValidator and QRegularExpression disagree on what a partial match means. [ChangeLog][QtGui][QRegularExpressionValidator] Allow empty string as intermediate match Change-Id: Ia6c55beb54870b1be5c88b6ef3eceebc8ca3f86b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Enable transformations for Qt Quick in FT engineEskil Abrahamsen Blomfeldt2014-11-202-11/+67
| | | | | | | | | | | | | | | | In Qt Quick (or in Qt Widgets when setting QT_NO_FT_CACHE to 1 or when using OpenGL engine), the alphaRGBMapForGlyph() will be used to get glyphs, because we need to keep our own cache. Transforms was not supported in this code path, instead it was turned off in supportsTransformations(). This patch enables transformations in the alphaRGBMapForGlyph() and alphaMapForGlyph() code paths as well, since this is needed for proper rendering with QT_DEVICE_PIXEL_RATIO. Change-Id: I7d6b79918f7c0bcc051a8343b16b315bfbba59cf Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QSortFilterProxyModel: keep the sorting on unrelated changesGiuseppe D'Angelo2014-11-202-5/+75
| | | | | | | | | | | | | | | | | | | | | Whenever the source model of a QSortFilterProxyModel changes, and the changes involve the sorted column, the implementation removes the changed rows from the mapping, sorts them, and inserts them back; in case of identical items, the rows are inserted at the end of the block of equal rows. The problem is that if the change doesn't actually happen on the roles that are used for sorting, then we shuffle the rows, terribly confusing the user. The typical case is a model with identical checkable rows: (un)checking one row will move it at the end. So, instead of trying to be smart with the removal/sort/insert sorted, simply resort everything under the changed parent index. Since the sorting used is stable, this keeps the items in the same positions. Task-number: QTBUG-1548 Change-Id: Id0e61bd49da53b0a3e8aefa6b6893ac41179dc6f Reviewed-by: David Faure <david.faure@kdab.com>
* Android: Compile for MIPSEskil Abrahamsen Blomfeldt2014-11-191-1/+1
| | | | | | | | | | | The qt_memfill32_asm_mips_dsp function is only declared if QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it unless the same macro is defined. Change-Id: Ib959b4b969b699ca78804394206266469b4ebf64 Task-number: QTBUG-36017 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable tst_QGraphicsView on OSXJørgen Lind2014-11-192-1/+9
| | | | | Change-Id: If1cec2ff90ff0a4bdcfdd0e21aa5c2118ce4e862 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Enable tst_qfiledialog2 on OSXJørgen Lind2014-11-192-1/+2
| | | | | | Change-Id: I7147d326b0f5bb218f4dbc013ed82efb4c1e1440 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Doc: added NoGesture to GestureState enumNico Vertriest2014-11-191-1/+1
| | | | | | Task-number: QTBUG-39988 Change-Id: I5481dfec75c90267a3a9be0d212df7384016e69d Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix rubberband position for tabbed mdi windowsPaul Olav Tvete2014-11-193-10/+17
| | | | | | | | | | | Place the rubberband over the tabs instead of where the hidden subwindows happen to be. [ChangeLog][QtWidgets][QMdiArea] Fix rubberband position for tabbed mdi windows Task-number: QTBUG-42612 Change-Id: I41e81ab8b99ab9e0fa533fd4ed1b2a8141d19753 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Fix invalid qmake syntaxPaul Olav Tvete2014-11-191-3/+5
| | | | | | | | Task-number: QTBUG-42549 Change-Id: I57ba3150e3a3b915faf0356d8a3f89801eb4963e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add a note about group separators to numeric validators.Friedemann Kleint2014-11-191-2/+12
| | | | | | Task-number: QTBUG-42522 Change-Id: I202cb98c51ba2332000772edfdc47d47c56e49c9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Do not force a content-type on POST request with no contentAllan Sandfeld Jensen2014-11-191-1/+1
| | | | | | | | | | | | While a POST request with no body may be a pointless thing it does happen on many websites. Currently this causes QtNetwork to print a warning to the console and set an invalid content-type. This patch allows the content-type to be absent when content is. Task-number: QTBUG-42479 Change-Id: Ia84c89147d2469a9421b9694d062c797987b3194 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix buildThiago Macieira2014-11-181-0/+1
| | | | | | | Caused by qstringlist.h no longer including qdatastream.h. Change-Id: I4dee5565ebaa1c8593633a6ad27f142e4424c5c9 Reviewed-by: David Faure <david.faure@kdab.com>
* Save a detach if QBrush::setColor does not change the brush colorAllan Sandfeld Jensen2014-11-181-0/+3
| | | | | | | | We can save detaching a QBrush when setColor is called trying to set the current color. Change-Id: I8f4042325d0f9c2bda69d469d6861e3cc310f329 Reviewed-by: Samuel Rødal <srodal@gmail.com>
* Add Windows-specific notation for WebDAV to QUrl.Friedemann Kleint2014-11-172-6/+44
| | | | | | | | | | | Convert a Windows-specific WebDAV specification "//host@SSL/path" into URL's with scheme set to "webdavs" and back to local file (Windows only). Task-number: QTBUG-42346 Change-Id: I12663243848ea7b2d3f208743e837e9de14a93eb Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix missing docs for QByteArrayListLaszlo Agocs2014-11-171-0/+1
| | | | | | | | The public is needed for qdoc which sees class, not struct. Task-number: QTBUG-42689 Change-Id: I28298b5fd13c6841838634a440bb2f726ddbe7be Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix broken resource cleanup in QOpenGLWidgetLaszlo Agocs2014-11-171-0/+10
| | | | | | | | | | | | | | | The context has to be made current. Otherwise we may fail to clean up or, what's worse, we may delete FBOs and textures in some random context. The latter was visible with ANGLE in the qopenglwidget example. When having two QOpenGLWidget instances, the context for the second happened to be the current one when destroying the first. This is now avoided by making sure the correct context is current when deleting the FBOs. Task-number: QTBUG-42696 Change-Id: I8c1eed7c13a869968cc67141e585d02c6bc6f279 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* QPanGestureRecognizer: Make the number of touch points a parameter.Friedemann Kleint2014-11-175-20/+41
| | | | | | | | | | | | | Prepare for determining the suitable number of touch points from the device type. For now, 2 points are used as before, which can be overridden by setting the environment variable QT_PAN_TOUCHPOINTS. Add member variable to QPanGesturePrivate which is set on gesture creation and later used for comparison. Task-number: QTBUG-40461 Change-Id: I6d9e35ca752375bc6a54435482ca0925195b8142 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update fbo toImage() docs regarding premultiplied alphaLaszlo Agocs2014-11-172-3/+31
| | | | | | | Task-number: QTBUG-42510 Task-number: QTBUG-37261 Change-Id: Ic11bec0a25e66df9d022f640621686be867e84d2 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Make configure fail on invalid (-no)-feature optionsN.Sukegawa2014-11-151-1/+6
| | | | | | | | | | | | | | | | configure script has been silently accepting whatever flags that begin with "-feature-" even if the feature name does not exist at all. Since the script validates many other flags, this behavior can make users believe flags they supply is valid when it isn't. Besides, this option is currently not protected against typo in any way. This commit verifies those flags against content of "qtbase/src/corelib/global/qfeatures.txt" and fails if supplied flag is not a valid feature name. Change-Id: Ib19ec66dd5558fb5491e8e080ce07d4807d94c1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* QFusionStyle: properly indent an if statementGiuseppe D'Angelo2014-11-141-1/+3
| | | | | | | | Fix the style trap that leads people into thinking that's an else-if, while it's a plain if. Change-Id: I62963f0d6270eadcbd8aede7bac60f83968cb0d4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Blacklist one test function in tst_QNetworkReplyTony Sarajärvi2014-11-141-0/+1
| | | | | | Task-number: QTBUG-32435 Change-Id: I07b1888b33daa00864e1793c1d12b1dccf562664 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Allow to use FT_Library_SetLcdFilter in bundled FreeType.Sérgio Martins2014-11-131-0/+1
| | | | | | | | | | | | | | For a default Qt build this change is a NOP, ftlcdfil.c is ifdefed by FT_CONFIG_OPTION_SUBPIXEL_RENDERING, which we don't define. But for users who changed ftoption.h, or are using 3rdparty/freetype/devel/ftoption.h instead of 3rdparty/freetype/include/freetype/config/ftoption.h they can now enable Subpixel rendering without getting a build error. Change-Id: I547e8a20514fcb97e4e56cb0100e9c2ed525f483 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* send touch update when more points begin after single touch is ignoredShawn Rutledge2014-11-132-3/+11
| | | | | | | | | | | Otherwise, a widget can't detect pinches if the points don't start simultaneously unless it sets WA_TouchPadAcceptSingleTouchEvents. The use case is for a widget that doesn't actually want the single touch events, but only when there are two or more touchpoints. Task-number: QTBUG-42389 Change-Id: I5269d9acb93a0001c4fde02b1f7b9e0dfcc0032f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* a widget's window is transient for its parent's top-level windowShawn Rutledge2014-11-131-2/+3
| | | | | | | | | | | When a widget's parent's window is not a top-level window, it should find the top-level window before calling setTransientParent, to avoid a warning (since a71e285133087714034f3c84a758980c85b3801e). Task-number: QTBUG-42464 Change-Id: I732691b0d40aba226470332426775d1bd4381009 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Add C++11 if available for QVariant autotestJørgen Lind2014-11-131-0/+1
| | | | | | | | | gcc 4.9 has the __has_include feature which enables the TEST_FORWARD_LIST and includes the forward_list header. This in turn checks that the c++11 flags are enabled, or throws an error. Change-Id: I44aa58e47c2f9ba6f14cb5a68d24da4a76698e5f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* remove nonsensical claim about contains()Oswald Buddenhagen2014-11-131-2/+3
| | | | | | | | | | | | | the string is implicitly anchored, so "foo" does of course not match "no-foo". this allows us to de-noise the generated qfeatures.pri somewhat. it still makes sense not to auto-include that file for performance reasons, so this change is a functional no-op. Change-Id: Ied75fd6459022c0b8c80843d62c4ab9eba9bf261 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add diaglib under manual tests.Friedemann Kleint2014-11-1313-0/+1104
| | | | | | | | | | | Add a set of helper functions and classes providing functionality for dumping widget/window hierarchies and logging events. They can be used by including a .pri file for diagnosing bugs and comparing Qt 5 to Qt 4. Change-Id: I0206f8e57b02540cd80a3e9446c894023d442ddc Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Mark QSocks5SocketEngine tests blacklistedTony Sarajärvi2014-11-131-0/+2
| | | | | | Task-number: QTBUG-42528 Change-Id: I3ba17b9d0f604215e6be0ec7199b12bf009c8b55 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix MinGW compiler warning in qwindowsxpstyle.cpp.Friedemann Kleint2014-11-131-1/+1
| | | | | | | qwindowsxpstyle.cpp: In static member function 'static QRect QWindowsXPStylePrivate::scrollBarGripperBounds(QStyle::State, const QWidget*, XPThemeData*)':styles\qwindowsxpstyle.cpp:2542:45: warning: suggest parentheses around '&&' within '||' [-Wparentheses] Change-Id: I6a4b62057a612fa9234744e892950c959c513d15 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Prevent a crash when buffer() returns 0Andy Shaw2014-11-131-1/+2
| | | | | | | | | | If buffer() returns 0 then there is no bufferPixels available which will cause a crash later on when it tries to set that memory. If this function fails then all we can do is return, a warning will have already been outputted from buffer() itself indicating why. Change-Id: I5890b3c34536f7f3d17def0936970c0a694b005a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QGraphicsTextItem: document that adjustSize can center/right align textGiuseppe D'Angelo2014-11-121-0/+1
| | | | | | | | | | | | | Unlike QTextEdit, there's no implicit width for a QGraphicsTextItem, meaning any rich text that is supposed to be centered or right aligned will not be unless the user explicitly sets the width. There's also another possibility: calling adjustSize() manually. Document that. Task-number: QTBUG-312 Change-Id: I83023269f4c63643e8224887efe2143dd1bb1908 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fixed QtGui's GL paint engine getting out of sync when using QtOpenGLSamuel Rødal2014-11-113-1/+48
| | | | | | | | | | We need to reset the active_engine belonging to QOpenGLContext whenever we make the QtOpenGL paint engine active, to give the OpenGL paint engine in QtGui a chance to sync its state if we've used the QtOpenGL paint engine inbetween. Change-Id: I445ce2f99bfbacf55650c881c4fdf07f2ff85069 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Fix for current_fbo getting out of sync in QtOpenGLSamuel Rødal2014-11-119-9/+138
| | | | | | | | | | | | | | | When using QGLWidget in combination with QOpenGLFramebufferObject from QtGui, instead of QGLFramebufferObject from QtOpenGL, the current_fbo variable doesn't get updated when framebuffer object bindings change. To ensure that the QGLWidget correctly releases the currently bound framebuffer object when using a QPainter, we keep track of whether QOpenGLFramebufferObject has modified the current FBO binding, and if that's the case we need to read the OpenGL state directly instead of relying on a cached value. Change-Id: If7e0bd936e202cad07365b5ce641ee01d2251930 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* mkspec macx-ios-clang: ensure SDK version is validRichard Moe Gustavsen2014-11-112-0/+8
| | | | | | | | | | | | | | | | | Ensure the sdk is of recent enough version since: 1. we build Qt with the latest sdk version, so the app needs to do the same to avoid compatibility problems e.g when linking. 2. using a launch screen to support iphone6 depends on sdk 8 3. Apple requires apps that are pushed to appstore to use the latest version of the sdk. Ideally we should store the sdk version used to build Qt, and require that apps use the same version or newer. But this patch will do until that is in place. Change-Id: I18b06d09c1eda15122975b7169ca7a3372df6054 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* QGraphicsItem: document that setOpacity(0) almost makes the item invisibleGiuseppe D'Angelo2014-11-111-2/+11
| | | | | | | | | This particular "feature" leaked into QtQuick1 back in the day. Still it was never documented in QGraphicsView. Task-number: QTBUG-18267 Change-Id: Ib5fb446015176f6e9b4095f6ec9030258cbd1ad4 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* Do not apply subpixel gamma-correction on XCBAllan Sandfeld Jensen2014-11-111-1/+3
| | | | | | | | | | | | | To match rendering of subpixel antialiased text in Qt 4.8 and other toolkits on X11, we should not apply gamma-correction. This also makes the rendering of subpixel antialiased text closer to normal antialiased text. Task-number: QTBUG-41590 Change-Id: I45ad3448334951353657b878d002eea429858f2d Reviewed-by: Samuel Rødal <srodal@gmail.com> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Document unified title and toolbar limitations.Morten Johan Sørvig2014-11-111-0/+7
| | | | | | Change-Id: Ib64a4586c186001730895e6771b01bb213d53b9f Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* OS X and iOS: Search for openssl libs in .app/Contents/FrameworksKai Koehne2014-11-111-0/+19
| | | | | | | | | | | | | | | | | | | | | This allows apps to ship their own openssl libraries inside the application bundle. The change consists of two parts: First, adding <bundle>/Contents/Frameworks to the alternative search paths. Second, disabling the preemtive check for libssl.dylib, libcrypto.dylib in the system paths: The system's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will still be picked up as a fallback in the alternative search paths, but only after .app/Contents/Frameworks have been inspected. [ChangeLog][QtNetwork][QSsl] On OS X and iOS, openssl dylib's are picked up from the 'Frameworks' directory of the app bundle. Change-Id: I982930f4a6cf5e0114c04ecbc87f27e54ba8bb88 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>