summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make building of platform plugins indifferent if its out of sourceJørgen Lind2011-06-0643-223/+316
| | | | | This requires some source files to be shipped with the Qt install They are now copied into QT_INSTALL_DATA/platform
* Made tst_QWidget::repaintWhenChildDeleted() pass.Samuel Rødal2011-06-061-0/+8
| | | | Implement some missing functionality in QWidget::destroy().
* Prevent tst_QWidget::showAndMoveChild() from failing on KDE.Samuel Rødal2011-06-061-0/+1
| | | | | Since we grab the desktop the KDE task bar appears on top of the window we're interested in. It's preferable to make the window a bit smaller.
* Avoid setting the active window to null when there is a FocusIn queued.Laszlo Agocs2011-06-064-1/+42
|
* Implemented QXcbScreen::topLevelAt(const QPoint &p).Samuel Rødal2011-06-064-3/+52
| | | | This makes the tst_QWidget::widgetAt() auto-test pass.
* Make XCB plugin work better in combination with auto-tests.Samuel Rødal2011-06-061-0/+1
| | | | | | | | | When an auto-test calls processEvents() indirectly via QTest::qWait(), QAbstractEventDispatcher::aboutToBlock() doesn't get emitted since the processEvents() implementation gets called without the QEventLoop::WaitForMoreEvents flag set. Since the auto-tests depend on all events getting delivered, we need to process the XCB events on awake() as well.
* Made the tst_QWidget::widgetAt() test a bit more robust.Samuel Rødal2011-06-061-10/+4
| | | | | The QTRY_VERIFY() should include the whole test, not just whether we got a widget or not, since it might be the wrong one.
* Basic QDesktopWidget support.Samuel Rødal2011-06-032-2/+11
| | | | | Makes it possible to use grabWindow on the desktop widget with the xcb plugin, which gives us a few more passing tests in tst_QWidget.
* Remove tst_QWidget::painterRedirection().Samuel Rødal2011-06-031-59/+0
| | | | | We've removed support for painter redirection, QWidget::render() should be used instead.
* Remove out-of-date TODOs.Laszlo Agocs2011-06-031-7/+1
|
* Prevent crash in QXcbIntegration::grabWindow().Samuel Rødal2011-06-031-2/+1
| | | | Copy the image explicitly before calling QPixmap::fromImage().
* Implemented QXcbIntegration::grabWindow().Samuel Rødal2011-06-035-6/+255
|
* Add support for mouse and keyboard grab.Laszlo Agocs2011-06-0310-39/+173
| | | | Reviewed-by: Samuel Rødal
* Prevent crash in tst_QWidget::persistentWinId().Samuel Rødal2011-06-031-1/+1
| | | | Only call createWinId() if we have a parent widget set.
* Get rid of superfluous debug output in the xcb plugin.Samuel Rødal2011-06-031-4/+0
|
* Made tst_QWidget::winIdChangeEvent() pass with Lighthouse.Samuel Rødal2011-06-032-2/+5
| | | | | We need to call setWinId() at appropriate times, and enable creation of native handles for child widgets when createWinId() is called.
* Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Jørgen Lind2011-06-012-9/+1
|\ | | | | | | refactor
| * Have tooltips shown properly with xcb.Laszlo Agocs2011-06-011-1/+1
| |
| * Make tst_QWidget::ensureCreated() pass with -platform xcb.Samuel Rødal2011-06-011-8/+0
| | | | | | | | We need the parent-creation logic to be enabled on QPA as well.
* | Compile fixJørgen Lind2011-06-017-18/+18
| |
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-01144-534/+1898
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/embedded/qmousepc_qws.cpp src/gui/embedded/qwslock.cpp src/plugins/decorations/default/default.pro src/plugins/decorations/styled/styled.pro src/plugins/decorations/windows/windows.pro src/plugins/gfxdrivers/ahi/ahi.pro src/plugins/gfxdrivers/directfb/directfb.pro src/plugins/gfxdrivers/eglnullws/eglnullws.pro src/plugins/gfxdrivers/linuxfb/linuxfb.pro src/plugins/gfxdrivers/qvfb/qvfb.pro src/plugins/gfxdrivers/transformed/transformed.pro src/plugins/gfxdrivers/vnc/vnc.pro src/plugins/graphicssystems/meego/meego.pro src/plugins/graphicssystems/opengl/opengl.pro src/plugins/graphicssystems/openvg/openvg.pro src/plugins/graphicssystems/shivavg/shivavg.pro src/plugins/graphicssystems/trace/trace.pro src/plugins/kbddrivers/linuxinput/linuxinput.pro src/plugins/mousedrivers/linuxtp/linuxtp.pro src/plugins/mousedrivers/pc/pc.pro src/plugins/mousedrivers/tslib/tslib.pro src/plugins/platforms/minimal/minimal.pro tests/auto/qerrormessage/qerrormessage.pro
| * sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-06-012-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The application can normally control the amount of buffering of a socket or QNetworkReply by using the setReadBufferSize API. This allows the application to flow control the TCP connection, and avoids out of memory errors when the data being downloaded is received faster than the application can process it. However when using a proxy, the proxy socket engine has an internal socket which is used to communicate with the proxy server. It is not visible to the user, and does not have awareness of the buffer size of the external socket. To solve this, we limit the internal sockets' buffer size to 64k bytes. Under normal operation, the data is swiftly copied to the external socket where the buffer can grow (or not) based on the application's set value for read buffer size. Task-number: QT-4966 Reviewed-by: Markus Goetz (cherry picked from commit c4727a85eed57a4db698326a1bed4aa75b6e5284) Change-Id: I29e6628e38b79b41c4464ba8cb772a0f03717043 Reviewed-on: http://codereview.qt.nokia.com/153 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
| * Make TextEdit word selection more natural.Andrew den Exter2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextControl will only extend the selection to a word if the cursor is directly over it which prevents the selection being extended if the mouse is dragged up or down a to a shorter line of text making it difficult to select multiple lines of text. Just disable that limitation when the TextEdit word selection is enabled. Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077 Task-number: QTBUG-19230 Reviewed-by: Martin Jones Reviewed-on: http://codereview.qt.nokia.com/292 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-06-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Update the micro focus when a mouse press changes the cursor position of a read only TextEdit. Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46 Task-number: QTBUG-19109 Reviewed-by: Martin Jones Reviewed-on: http://codereview.qt.nokia.com/291 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-06-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the cursor position does not exceed the bounds of the current text. Change-Id: If38f7729372562324d11eadd1a976c0c6da91863 Task-number: QTBUG-19054 Reviewed-by: Martin Jones (cherry picked from commit 6fbfb1ab3f26ad672eb24f9b4a0ce1a8eea08298) Reviewed-on: http://codereview.qt.nokia.com/290 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Fix build in C++0x modeBernhard Rosenkraenzer2011-05-313-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compiler errors (gcc 4.6 -std=gnu++0x on x86_64 Linux): embedded/qwslock.cpp: In function `bool forceLock(int, int, int)': embedded/qwslock.cpp:121:39: error: narrowing conversion of `semNum' from `int' to `short unsigned int' inside { } [-fpermissive] (and equivalent errors in other lines/files) See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf Section 8.5.4/6 Change-Id: I2cbac5482b87f33287a416af5a5c9bde621720bc Reviewed-By: Olivier Goffart Merge-Request: 1240 Reviewed-on: http://codereview.qt.nokia.com/275 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Made qpluginbase.pri into a feature profile.axis2011-05-3158-97/+98
| | | | | | | | | | | | | | | | | | | | | | This enables other modules to use it without having access to the QtBase sources. Change-Id: I0a588b2e14ca88fa068c7c2bcc69ff669444f6c6 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/237 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Moved certain qmake config variables to .qmake.cache.axis2011-05-311-23/+20
| | | | | | | | | | | | | | | | | | | | | | The reason is that these are local to the build, and should not be present inside the qmodule.pri file, because this file is installed. Change-Id: I2207f2bf068b1aafd14e60d106c7028ca53d5efd Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/238 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Fixed linking against QtQuickTest on mac.Charles Yin2011-05-311-15/+1
| | | | | | | | | | | | | | | | | | | | qmltest is now a Qt module, so it's not necessary to configure the include&library paths manually. Change-Id: I1d2baa67138e08ab9007fba9f6adcf8847509ba8 Reviewed-on: http://codereview.qt.nokia.com/163 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Export the qt_gl_read_framebuffer function for use in declarativeGunnar Sletta2011-05-303-3/+3
| | | | | | | | | | | | | | Change-Id: Ia1dd186ca954774e1faaa4b2e606acac9333d9b0 Reviewed-on: http://codereview.qt.nokia.com/224 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-304-7/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to find out the closest element in the ligature to the point we clicked (or tapped), currently we do this by dividing the width of that ligature glyph evenly by the number of characters it covered. We only support Common and Greek script at this point, ligatures in other scripts are still handled as a whole. Task-number: QTBUG-19260 Reviewed-by: Eskil (cherry picked from commit 5338d78aa9d80ddd2bcb21e6b22cd2cf1522a7d3) Change-Id: Ic747e9458d561aca0848dcd1e8b94e0a23fd8189 Reviewed-on: http://codereview.qt.nokia.com/196 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Only add dependent include when not already thereMarius Storm-Olsen2011-05-271-1/+1
| | | | | | | | | | | | Change-Id: I517ad8188a6f6b5ade763f0189f434f446ab6f05 Reviewed-on: http://codereview.qt.nokia.com/198 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Fix ligature offset in multi-line textJiang Jiang2011-05-272-2/+19
| | | | | | | | | | | | | | | | | | Reviewed-by: Eskil (cherry picked from commit 278cf1f37945050c4a46d5acab0659f3a7546a43) Change-Id: Ice20aa38a49ea16cf56bd3705c7d400ee165a9c2 Reviewed-on: http://codereview.qt.nokia.com/195 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Fix compile for systems with old fontconfigJiang Jiang2011-05-271-0/+5
| | | | | | | | | | | | Change-Id: Ia26796bdbab7988d14163d3c1290111c0cb22bf7 Reviewed-on: http://codereview.qt.nokia.com/182 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Add QUuid::toRfc4122() and fromRfc4122()Liang Qi2011-05-274-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the RFC4122, provide the interfaces between QUuid and QByteArray, they are simpler then toByteArray() and relevant. Thanks for the suggestion and brief code from Robin Burchell. Task-number: QTBUG-19420 Reviewed-by: joao (cherry picked from commit 06873e467d98ad60d827afae29500bf2ff783c03) Change-Id: I4623ae3363f1d5affa45de73fac616bb67a9eaa1 Reviewed-on: http://codereview.qt.nokia.com/168 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Add QUuid::toByteArray() and relevantLiang Qi2011-05-274-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | Add QUuid::toByteArray() and QUuid(const QByteArray &). Same behavior with QUuid::toString() and QUuid(const QString &). Task-number: QTBUG-19419 Reviewed-by: joao (cherry picked from commit 71f923f29e2c60444a85fc765fc582e06cb7eca4) Change-Id: I41dad65e269f739ba9ec1c27e9da96af6401356c Reviewed-on: http://codereview.qt.nokia.com/167 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * QDataStream: speedup steaming of QUuid.Liang Qi2011-05-271-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | By reading and writing as a whole block, because the size of QUuid is fixed. Reviewed-by: joao (cherry picked from commit d56d7f107f9d18810d742ac4d3a2e36077722cb8) Change-Id: I90554d68da7394c99c48acd0bc5a0eee3b3f7776 Reviewed-on: http://codereview.qt.nokia.com/169 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Optimize QUuid::QUuid(const char *)Liang Qi2011-05-271-1/+9
| | | | | | | | | | | | | | | | | | Reviewed-by: joao (cherry picked from commit 96d10abbb40c52ac6274f1144766f3fb27dfd726) Change-Id: I050b602b6cac669b4d88046b0a707048ce0a8cda Reviewed-on: http://codereview.qt.nokia.com/170 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Fix the build for QUuidLiang Qi2011-05-272-2/+6
| | | | | | | | | | | | | | | | | | | | | | Add a quint8 specialization for qbswap. Reviewed-by: Bradley T. Hughes (cherry picked from commit 32a583b575da1b387955734ccf36b0a93de37670) Change-Id: I7dae5e47565ed30de960983649e5c214e0303fe3 Reviewed-on: http://codereview.qt.nokia.com/171 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * uic: #include <QLayout> for QToolBox on non-laid-out forms.Friedemann Kleint2011-05-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | for the fake tab-spacing property, which accesses the internal layout and sets its spacing. Task-number: QTBUG-19339 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Change-Id: I89f5c035bd3798a0998c3046de643bda0fa8da6b (cherry picked from commit 89f5c035bd3798a0998c3046de643bda0fa8da6b) Reviewed-on: http://codereview.qt.nokia.com/173 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * uic: Use QString::fromUtf8 for QUrl properties.Friedemann Kleint2011-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | As otherwise the compilation of ui_-files fails when using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Change-Id: I00bf2e2605b97ff77efdcb68b7968375b3e9d195 (cherry picked from commit 00bf2e2605b97ff77efdcb68b7968375b3e9d195) Reviewed-on: http://codereview.qt.nokia.com/174 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Fix a regression in QList::mid()Liang Qi2011-05-272-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't need to copy anything when pos is after size(). Task-number: QTBUG-19164 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 8befc4982a32752e48c82cacbed045e7336a3569) Change-Id: Iccac75842616f0d41e457e844a15d1a3ccfeb642 Reviewed-on: http://codereview.qt.nokia.com/164 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Add some autotests and benchmarks for QUuidLiang Qi2011-05-272-2/+152
| | | | | | | | | | | | | | | | | | | | | | Missing those functions for optimization. Reviewed-by: joao (cherry picked from commit 4e9286880fd2686e61de2c4be3c317e01f0d9989) Change-Id: I147e028f10cec7abc545dcbcca911d39a89d830e Reviewed-on: http://codereview.qt.nokia.com/165 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * Optimize QUuid::toString() and relevantLiang Qi2011-05-272-55/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUuid::toString() and QUuid(const QString &) are too slow now. Task-number: QTBUG-19418 Reviewed-by: joao Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin Reviewed-by: Robin Burchell Reviewed-by: Richard J. Moore (cherry picked from commit 7ce566ed82666ac08f137f4d8590ce589d42c82a) Change-Id: I7e5bb4072f0941c20a7278a2d9766d4ef47be811 Reviewed-on: http://codereview.qt.nokia.com/166 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * tests: fixed compile of tst_macguiRohan McGovern2011-05-271-0/+2
| | | | | | | | | | | | | | | | This test uses private headers. Mark it as such. Change-Id: Icb6463629e1414b9da5403d0e0d766d8a113bd57 Reviewed-on: http://codereview.qt.nokia.com/160 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * tests: fixed compilation of qstring benchmark on macRohan McGovern2011-05-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, MAP_ANONYMOUS and MAP_POPULATE are not defined. Fix MAP_ANONYMOUS by defining it to MAP_ANON. Fix MAP_POPULATE by removing it, because its usage was unnecessary in this code (the page was explicitly faulted in a few lines later anyway). Change-Id: Iead82e1a949b35fe3c304d38babac8d4dc6f0769 Reviewed-on: http://codereview.qt.nokia.com/162 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * Make lexgen tests compileJason McDonald2011-05-271-2/+1
| | | | | | | | | | | | | | | | Correctly declare that the tests depend on the Qt build having testlib. Change-Id: Icf3332bc81a10e701316f1cd7021d2f6d3c2f424 Reviewed-on: http://codereview.qt.nokia.com/158 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Use "QT += testlib" consistentlyJason McDonald2011-05-2711-36/+7
| | | | | | | | | | | | | | | | | | | | If a project uses "load(qttest_p4)" it doesn't need to add testlib to the CONFIG or QT variables. If a project does not use "load(qttest_p4)", it should add "testlib" to the QT variable. Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd Reviewed-on: http://codereview.qt.nokia.com/159 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-262-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Some complex widgets might get a negatively sized rectangle when calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite recursion. Normalizing the rectangle size before checking for size change is enough to break this infinite recursion. Task-number: QTBUG-17333 Change-Id: I4682c3088ea53fb9f28f746c8264f573b5284825 Reviewed-on: http://codereview.qt.nokia.com/156 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Fix typo in commentOlivier Goffart2011-05-261-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit c8a3c427e96ee11907592f5c7f72046795c027ed) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/145 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: axis
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:02:22 +0000