summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0Andy Shaw2012-06-221-1/+2
| | | | | | | | | | | | When doing a NTML authentication it would close the connection after the second phase before replying when the reply was a HTTP 1.0 version reply. Since the Proxy-Connection header is set to Keep-Alive in this case we want to ensure we do not close in this siutation. Task-number: QTBUG-26037 Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix key modifiers in mouse wheel events on Windows.Glenn Watson2012-06-222-1/+14
| | | | | | | | | | | | The Windows platform plugin was not checking for the control or shift keyboard modifiers when processing mouse wheel events. Added a function to convert Windows wheel events to Qt::KeyboardModifiers and passed this through the event chain. Task-number: QTBUG-25754 Change-Id: I6551e98b4eaebad5704058bddfb06502ded5155d Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Reimplement QXcbWindow::startSystemResize() with xcbUli Schlachter2012-06-222-22/+15
| | | | | | | | | | This function just sends a ClientMessage to the window manager. XCB can do this fine and there is no need to require Xlib for the job. Change-Id: Iad3d78c393c1f439fff987fa19b4d82513810930 Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* qtdbus: Export org.freedesktop.DBus.Peer interface when introspectedDaniele E. Domenichelli2012-06-221-0/+9
| | | | | | | | | | | | | | | | | The ofD.Peer interface is automatically implemented when an object is registered on DBus, but the ofD.Introspectable.Introspect method does not show it. You can test it by running $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.Ping $ qdbus --literal <some service> <some object> \ > org.freedesktop.DBus.Peer.GetMachineId Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QUnicodeTables: some internal API renamingsKonstantin Ritt2012-06-224-260/+260
| | | | | | | | | | | | enums GraphemeBreak, WordBreak, and SentenceBreak has been renamed to GraphemeBreakClass, WordBreakClass, and SentenceBreakClass respectively, their values has been renamed to contain a '_' as logical enum-value separator (just like many other nums in Qt, e.g. LineBreakClass); *BreakFormat has been replaced with *Break_Extend (some format characters are kind of subtype of the extender characters, not vice versa). Change-Id: I9ddbcf8848da87409736c2d6d1798a62fa28cab8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Clean-up the Unicode tables generator code and the generated headerKonstantin Ritt2012-06-222-636/+635
| | | | | | | | | | | | This fixes the blocks and memory consumption reports, the whitespace issues and makes the code a bit cleaner. Since I'm the only one who does change this code, such a no-op commit could not hurt anyone or even git blame ;) Change-Id: Ib069f925a3791c82e16c368c8392bcffbfd68c53 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* embedded doesn't exist anymoreGirish Ramakrishnan2012-06-221-3/+0
| | | | | Change-Id: Ib56895defb72f51bb790994b9fd72fc81ef25af5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qgraphicsview hoverLeave regressedToby Tomkins2012-06-221-0/+3
| | | | | | | Task-number: QTBUG-26274 Change-Id: Ieafc6bf4a7fa5287985610a4dea57fbe6f3a9eba Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Restore building of examples, tests.Rohan McGovern2012-06-221-2/+2
| | | | | | | | | | Without this, a simple "configure && make" will not build the examples or tests, even if the "-make tests -make examples" options were used. This is a partial revert of 709cc8800e7d8600e181cf6b9f8b1033faefe596. Change-Id: If363cd24d30ba4c102a35ed2617999ae4e9ed9b0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fixes high CPU usage on timer expiration when using glib event loop.Daniel Thor Kristjansson2012-06-211-1/+1
| | | | | | | | | | | GTimerSource has 1ms accuracy, QTimerInfoList::timerWait() has 1us accuracy. So when there is less than 1 ms left on the timer we enter a tight loop checking for timer expiration since we don't round up the timerWait() timer to the nearest millisecond. Task-number: QTBUG-7618 Change-Id: I684c9236324f598bc69c6810be270aa47c791f91 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update the docs about setRoleNames deprecation.Stephen Kelly2012-06-211-0/+2
| | | | | | Change-Id: I5aff626979238014d34cba1d383051cd4b048499 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* fix doc typo in qwindow.cppJoerg Bornemann2012-06-211-1/+1
| | | | | Change-Id: I0980319e32b94882fe882c57cd8341f6b3e62048 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix possible crash when copying QImage.Kim Motoyoshi Kalland2012-06-211-1/+1
| | | | | | | Task-number: QTBUG-14766 Change-Id: I82a4736dbd5ac08ede1b2bdccfa29a2009ebb4d8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QDoc: Use the module page as link in qt.ditamap.Casper van Donderen2012-06-212-7/+17
| | | | | | | If the number of [QML]module pages in a single qdoc run is 1: Use it as the link for the nested group of documentation pages in the automatically generated ditamap. Change-Id: Idbc3e2e5d65a1e7f0201638102ffab62475a66ec Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Use 'Type' instead of 'element' in instantiates.Casper van Donderen2012-06-212-4/+4
| | | | | | | | | On a C++ documentation page "is instantiated by QML element" was printed when you have a QML Type that instantiates this class. The text is now changed to "is instantiated by QML Type". Change-Id: I6c93531edc6ef9ac112573034fd54fa52390bc37 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Remove QWS references from testlibGirish Ramakrishnan2012-06-212-11/+0
| | | | | Change-Id: Iad52a5c44b27cb11a47987c9f8890cc67b557fb7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Avoid unnecessary detach when saving to BMP.Kim Motoyoshi Kalland2012-06-211-5/+5
| | | | | | | Task-number: QTBUG-11486 Change-Id: Ic9aa733da4f23dc3eaba111c97a39bfd911f8cb3 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* New command line switches for configure.exeRafael Roquetto2012-06-211-7/+158
| | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -nis (-no-nis) * -cups (-no-cups) * -iconv (-sun-iconv, -gnu-iconv, -no-iconv) * -neon (-no-neon) * -largefile * -fontconfig (-no-fontconfig) * -posix-ipc * -glib * -system-freetype * -sysconfdir <dir> Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QTextLayout docs: a minor typo fixKonstantin Ritt2012-06-211-1/+1
| | | | | Change-Id: I5e6d02f17e9064afe0c21dda806e67bc14c728b7 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* proper filling when using Qt::TexturePatternKonrad Grochowski2012-06-211-1/+1
| | | | | | | | | fix for using both Qt::OpaqueMode and Qt::TexturePatter for filling Task-number: QTBUG-19202 Change-Id: Ia92363cacaa51140fe78b542d9768aead81868ff Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Fix qitemview and qdatetimeedit autotest builds for WinCE.Janne Anttila2012-06-212-0/+8
| | | | | | | | | Defined missing SPI_GETPLATFORMTYPE macro as it was done in for example in qwidget and qaccesiblity test cases. Change-Id: I33a1e0119848911fbc4830299fcc1854f5259e86 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix qdiriterator autotest build for WEC7.Janne Anttila2012-06-211-1/+1
| | | | | | Change-Id: I18b1bdd79905761eff7a5ddbe1c6538c33624a1f Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fixed mouse grabbing preventing popups from being closed.Samuel Rødal2012-06-212-1/+50
| | | | | | | | | | | The pointer grabbing leads to fake Enter events being sent to the Qt::Popup window, preventing it from closing since QWidget::underMouse() returns true. We should only send Enter events if the mouse is actually inside the widget. Change-Id: I4ba3fb08943580f93ad4337ff0227becd647767e Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Handle fragmented responses on SOCKS5 control channelShane Kearns2012-06-213-34/+165
| | | | | | | | | | | | Server responses may arrive in more than one packet, though this is rare due to nagle algorithm. Also fixed IPv6 addresses being discarded from server responses, which was caught by the new autotest. Task-number: QTBUG-18564 Change-Id: I32d9e2978037fb3e1fff27b7e618b5da6d222f28 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Fix qfile autotest build for WEC7Janne Anttila2012-06-212-3/+5
| | | | | | Change-Id: I6c4b4c91ea841ccb91ad685510caaecaf51baced Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add new benchmark metrics to testlibChris Adams2012-06-212-1/+18
| | | | | | | | | | | | | | | QElapsedTimer provides nanosecond-resolution elapsed timing, which allows for finer granularity benchmark reporting. Also, clients may also wish to benchmark the memory usage of a particular component, but no metric currently exists which matches that requirement. This commit adds the WalltimeNanoseconds and BytesAllocated metrics to meet these needs. It is intended for manual use by clients via setBenchmarkResult() only. Change-Id: Ib37ada374e265c857eda02d047d51d436618e4a7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Doc: tmake -> qmake, it's about timeDaniel Molkentin2012-06-211-8/+8
| | | | | | | | | Pushing this before 5.0 since it will most certainly trigger a major recompile, which is probably why this has never been changed. Change-Id: I5fd90537d3b754d0a8a1b522d66183513693e0af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Change default Content-Type for http POST to match 4.7.4Shane Kearns2012-06-211-2/+5
| | | | | | | | | | | | | | | Qt 4.7.3 sent no Content-Type header by default. This was fixed independently on 4.8.0 and 4.7.4 branches, with different defaults. Since this is often used for web service logins, the 4.7.4 default of x-www-form-urlencoded seems more likely to work. The warning message is left in place, since not specifying the content type is still an application bug. Task-number: QTBUG-23350 Change-Id: I30bf50fd216ee9894d0168e904cea1ed4251ec68 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Remove references to Q_WS_QWSGirish Ramakrishnan2012-06-206-47/+5
| | | | | | | | | | | | | Affected code includes: src/widgets/dialogs/qmessagebox.cpp src/widgets/graphicsview/qgraphicsitem.cpp src/widgets/kernel/qapplication_p.h src/widgets/kernel/qwhatsthis.cpp src/widgets/kernel/qwidget.h src/widgets/widgets/qdockwidget.cpp Change-Id: Ib9e920b3cc1253b39e4e00d7137c21321ecc0399 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* plastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIconsGirish Ramakrishnan2012-06-201-3/+6
| | | | | Change-Id: I2f493d45820063ef62f16febde0df89a874dddb0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove dead codeGirish Ramakrishnan2012-06-201-4/+0
| | | | | Change-Id: I48c1e3b2ebcf4ec2fb21ed2d1a88e1dae64e937d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix QWidgetWindow sending duplicate drag-drop eventsJames Turner2012-06-201-1/+1
| | | | | | | | | | Unlike the other event handlers in QWidgetWindow, the drag-drop events are not followed by an early return. This causes all drag-drop events to also be sent to the root widget of the window, which is a bug. For example in the fridgemagnets example, where the target widget and root widget are the same, the drop event is received twice. Change-Id: I99e56ad8c48b3d31b0bd7c815cea8490edbf0af4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Record if a metatype is a smart pointer to a QObject derived.Stephen Kelly2012-06-204-18/+66
| | | | | | | | | | | | This allows QVariant/QMetaType software (such as QtDeclarative) to deal with smart pointers in a similar way to how they can deal with naked pointers (accessing properties etc). This also adds a requirement that T be fully defined when QSharedPointer<T> is inserted into a QVariant. Change-Id: I29e12b8a6aa5f4aadbd62f92b89bc238f64b5725 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Add some internal API for extracting a QSharedPointer<T> from QVariant.Stephen Kelly2012-06-205-1/+155
| | | | | | | | | | | | | The T must be derived from QObject, or it will fail to compile. This will allow scripting or other 'wrapping' and runtime environments like QtDeclarative to handle QSharedPointers to types derived from QObject properly. A QSharedPointer<T> can be inserted into a QVariant, and where T derives from QObject, a QSharedPointer<QObject> can be extracted from the QVariant, and its properties are then accessible. Change-Id: I68d6d89aceceb019267bd7301baa2047f9c09b90 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNetworkAccessManager: delete the httpThreadMartin Petersson2012-06-202-4/+12
| | | | | | | | | | | | | The httpThread was using deleteLater the finished signal of the thread to call the deleteLater slot. If the QNetworkAccessManager is deleted when the application is closed then then fished is emitted but we never return to the eventloop so the deletion is never done. This will delete the httpThread directly instead of using deleteLater Task-number: QTBUG-25487 Change-Id: I1fdbd4eca01e8bd8b3a98936298e5c78217752b4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Change *-clang mkspec globs to *-clang*Bradley T. Hughes2012-06-202-2/+2
| | | | | | | | Like with the numerous g++ mkspecs, we have mkspecs with suffixes, and these mkspecs should still match the clang globs. Change-Id: I9296408b5192bc72cc468d229a57923e3f5ab6f0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32Bradley T. Hughes2012-06-204-0/+129
| | | | | | | | | Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix tst_QWidget::getSetCheck on WindowsJoerg Bornemann2012-06-201-1/+1
| | | | | Change-Id: Ie11a7576f8e618e2fedb31bd8071abb44b9f9f57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix unused parameter warnings in moc test.Mitch Curtis2012-06-201-3/+3
| | | | | Change-Id: I3467a8bf99464c2d3762a171b20508bb4b29ddb4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make QUuid compile with QT_NO_QUUID_STRING without breaking QDebug <<Jeremy Katz2012-06-201-1/+6
| | | | | | | | | | | | | | Change I0cbb0581a1c3abefdde75b7cd45fdafd31640f0d breaks the use of operator<< for QDebug, which shows up when trying to link QtCore in the small qconfig. Instead, render QUuid as "QUuid(QT_NO_QUUID_STRING)". Task-number: QTBUG-24816 Change-Id: Ia52283d7461a9907bcec7a110e41c9f830895efe Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* define QT_NO_ICONV if QT_NO_TEXTCODECJeremy Katz2012-06-203-10/+29
| | | | | | | | | | | | This also updates qfeatures.h with various other things that have been neglected. Run $QTSRCDIR/util/scripts/make_qfeatures_dot_h after changing qfeatures.txt Task-number: QTBUG-24816 Change-Id: I18b71fcec71efa9cfe3425fb1a7833456ec411b9 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QVariant compile with QT_NO_QUUID_STRINGJeremy Katz2012-06-201-0/+4
| | | | | | | | Task-number: QTBUG-24816 Change-Id: I76e6a6bcf1a2381e14f400648e3cb8ba554772a6 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Mac: Fix rendering of non-int sized fonts.Eike Ziller2012-06-202-17/+24
| | | | | | | | | Scrolling happens in integer steps, so it's necessary to use a fractional correction value. Task-number: QTCREATORBUG-7127 Change-Id: I6eccba6532f95aa4bf9270bdaec4b57280dc8e3d Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
* Document and use UserEvent::nullWindow for event deliveryGirish Ramakrishnan2012-06-201-54/+61
| | | | | | | | | | | | | | | | | nullWindow is used to track if the window was null when the event was created. If the window was null at contruction time, the qpa event delivery code will choose a window to deliver it to. If the window was not-null at creation time but became null during the actuall event processing time, the event is ignored. All the event delivery except the touch event delivery has been changed to reflect this. I have not changed touch event delivery because I don't really know what all need to be retranslated into new window co-ordinates. Change-Id: Ic62d12a13e70dd4d01226509411817db1b6af108 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Merge "Merge branch 'buildsystem'" into refs/staging/masterOswald Buddenhagen2012-06-20176-2616/+2416
|\
| * Merge branch 'buildsystem'Oswald Buddenhagen2012-06-19176-2616/+2416
| |\ | | | | | | | | | | | | | | | | | | This appears to be fully backwards-compatible with all tested modules, as far as CI is concerned. Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6
| | * Fixed Wince Makefile environmentBjoern Breitmeyer2012-06-197-6/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated the checksdk tool into qmake and made the makefiles selfcontained, so configure make, is now enough to build qt for wince Change-Id: I29076702eca2ec23d4d06bb3d5c5cef9d4f95161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * make missing qt modules fatalOswald Buddenhagen2012-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | there is no point in continuing; it will error out later (in more cryptic ways) anyway. Change-Id: I2562eadc2d91bfaa6e85368dc3774da31409a141
| | * less confusing wordingOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | | | Change-Id: Ia509fe1a28de803673623d425f5949b35404598c
| | * fix misnomer: qt_module.prf => qt_build_config.prfOswald Buddenhagen2012-06-1916-47/+49
| | | | | | | | | | | | | | | | | | qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 05:38:46 +0000