summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-306130-173977/+356183
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * Fixed compile with Windows CE 5.Rohan McGovern2009-06-291-0/+4
| | | | | | | | On some systems, math.h still doesn't define M_PI.
| * QXmlQuery: add setFocus(const QString &).Frans Englich2009-06-292-0/+20
| | | | | | | | | | | | | | | | Requested by Girish and Jurgen. Useful for training and small examples. Task-number: 245219 Reviewed-by: Tobias Koenig AutoTest: Included in this submit.
| * QMenuBar: adding autotest for the geometry calculationThierry Bastian2009-06-291-5/+6
| | | | | | | | Also fixed a bug that would take the VMargin 3 times instead of 2.
| * Fix some coverity warningsThierry Bastian2009-06-295-9/+8
| |
| * QMenuBar: some private members weren't initializedThierry Bastian2009-06-291-1/+4
| | | | | | | | This was a coverity warning
| * Initialize the time structure in QTime::currentTime()Benjamin Poulain2009-06-291-2/+1
| | | | | | | | | | | | | | | | In QTime::currentTime(), the pointer to the tm structure was used without being initialized. Task-number: 256889 Reviewed-by: Markus Goetz
| * QMenuBar: adding autotest and simplify/fix geometry calculationThierry Bastian2009-06-292-15/+9
| |
| * QMenu: adding autotest for the geometry calculationsThierry Bastian2009-06-291-4/+4
| | | | | | | | I also fixed an off-by-1 pixel bug
| * QMenu: fixed geometry problem that was adding twice the panel widthThierry Bastian2009-06-291-5/+6
| |
| * QMenuBar: simplification of codeThierry Bastian2009-06-293-114/+99
| | | | | | | | More to come: calculation of geometry
| * Fixed some regressions in the OpenGL pixmap backend.Samuel Rødal2009-06-292-4/+13
| | | | | | | | | | | | | | | | Make sure a QPixmap gets an alpha channel when filled with a non-opaque color, and fix issues where shader manager did not active correct shader program. Reviewed-by: Tom
| * Re-apply change bd7c123dc88908f41e6c0eccb9b03f9684e5ca27 by Thiago MacieiraThiago Macieira2009-06-293-11/+9
| | | | | | | | | | | | | | | | | | | | Silenced a warning caused by (apparently) a gcc 4.3 bug: gcc 4.3 and 4.4 keep giving us a warning like: 'function()::type' declared with greater visibility than the type of its field 'function()::type::subtype' This seems to be a gcc bug. See the bug report for more information: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40145
| * Re-apply change 353dcfd307853da289fdd245410e2e07358624a0 by Friedemann KleintFriedemann Kleint2009-06-291-1/+16
| | | | | | | | | | Re-apply change 89e6d626f1e23858735659a1596408cd7a521c02 by Friedemann Kleint Commented out code that breaks MinGW. Reviewed-by: Simon Hausmann <shausman@trolltech.com>
| * Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-06-29232-1619/+6414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-29062009 ( 22aadba1b4356ad7d8e9446b95baccb6b2c037b0 ) Changes in WebKit/qt since the last update: 2009-06-29 Simon Hausmann <simon.hausmann@nokia.com> Fix the Qt build, add missing isSpeaking() implementation to ContextMenuClient. * WebCoreSupport/ContextMenuClientQt.cpp: (WebCore::ContextMenuClientQt::isSpeaking): * WebCoreSupport/ContextMenuClientQt.h: 2009-06-28 Sriram Yadavalli <sriram.yadavalli@nokia.com> Reviewed by Eric Seidel. [Qt] Fix build break for Qt https://bugs.webkit.org/show_bug.cgi?id=26779 * Api/qwebpage.cpp: (QWebPage::swallowContextMenuEvent): 2009-06-27 Simon Hausmann <simon.hausmann@nokia.com> Build fix for Qt under Windows. * Api/qwebhistory.h: Use consistent export linkage for the datastream operators. 2009-06-26 Brian Weinstein <bweinstein@apple.com> Reviewed by Simon Fraser. Changed call of scrollbarUnderMouse to scrollbarUnderPoint to match new API. * Api/qwebpage.cpp: (QWebPage::swallowContextMenuEvent): 2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. Add support for saving and loading of QWebHistory to and from a QByteArray. This includes streaming operators for QWebHistory. for convenience. New autotests that test QWebHistory and QWebHistoryItem serialization. * Api/qwebhistory.cpp: (QWebHistory::restoreState): (QWebHistory::saveState): (operator<<): (operator>>): * Api/qwebhistory.h: * Api/qwebhistory_p.h: * tests/qwebhistory/tst_qwebhistory.cpp: (tst_QWebHistory::): (tst_QWebHistory::init): (tst_QWebHistory::title): (tst_QWebHistory::count): (tst_QWebHistory::back): (tst_QWebHistory::forward): (tst_QWebHistory::itemAt): (tst_QWebHistory::goToItem): (tst_QWebHistory::items): (tst_QWebHistory::serialize_1): (tst_QWebHistory::serialize_2): (tst_QWebHistory::serialize_3): (tst_QWebHistory::saveAndRestore_1): (tst_QWebHistory::saveAndRestore_2): (tst_QWebHistory::saveAndRestore_3): 2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. Fix the behaviour of QWebHistory::itemAt to interpret the specified index as absolute index. Returns an invalid QWebHistoryItem if the index is out of range. * Api/qwebhistory.cpp: (QWebHistory::itemAt): * tests/qwebhistory/tst_qwebhistory.cpp: (tst_QWebHistory::itemAt): 2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. Added a few autotest to QWebHistory. * tests/qwebhistory/data/page1.html: Added. * tests/qwebhistory/data/page2.html: Added. * tests/qwebhistory/data/page3.html: Added. * tests/qwebhistory/data/page4.html: Added. * tests/qwebhistory/data/page5.html: Added. * tests/qwebhistory/data/page6.html: Added. * tests/qwebhistory/qwebhistory.pro: Added. * tests/qwebhistory/tst_qwebhistory.cpp: Added. (tst_QWebHistory::): (tst_QWebHistory::tst_QWebHistory): (tst_QWebHistory::~tst_QWebHistory): (tst_QWebHistory::init): (tst_QWebHistory::cleanup): (tst_QWebHistory::title): (tst_QWebHistory::count): (tst_QWebHistory::back): (tst_QWebHistory::forward): (tst_QWebHistory::goToItem): (tst_QWebHistory::items): * tests/qwebhistory/tst_qwebhistory.qrc: Added. * tests/tests.pro: 2009-06-26 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed by Simon Hausmann. Fix support for documenting functions prefixed with QWEBKIT_EXPORT Add QWEBKIT_EXPORT to the list of macros to ignore by qdoc. * docs/qtwebkit.qdocconf: 2009-06-26 Yongjun Zhang <yongjun.zhang@nokia.com> Reviewed by Eric Seidel. Bug 20303: [Qt] Key events are not working in frames. Send scrolling events to current focused frame, bubble the event up to parent frame if it is not handled. Use EventHandler's new shared scrolling code. * Api/qwebpage.cpp: (QWebPagePrivate::keyPressEvent): (QWebPagePrivate::handleScrolling): * Api/qwebpage_p.h: 2009-06-25 Jakub Wieczorek <faw217@gmail.com> Reviewed by Adam Treat. Add highlight functionality to the QWebPage::findText() method. Introduced is new HighlightAllOccurrences flag which passed to the function will make it mark all existing occurrences of specified string in the page. * Api/qwebpage.cpp: (QWebPage::findText): * Api/qwebpage.h: * Api/qwebview.cpp:
| * Doc - Improved the Detailed Description section for QCheckBox withKavindra Devi Palaraja2009-06-291-58/+71
| | | | | | | | | | | | | | | | | | | | screenshots and some cleaned up sentences. Reviewed-By: TrustMe Details: Also fixed the error in the sentence mentioning that QButtonGroup can be used to group buttons visually thanks to a bug report.
| * QNAM HTTP Code: Properly use the QRingBuffer for some kind of data.Markus Goetz2009-06-293-28/+75
| | | | | | | | | | | | | | Use the QRingBuffer properly when reading known-size, non-chunked, non-compressed data from HTTP. Reviewed-by: Thiago Macieira
| * Compile.Norwegian Rock Cat2009-06-291-1/+1
| | | | | | | | | | I now need to get the index of the action before I can find any corresponding window item.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-06-292-2/+6
| |\
| | * Fixed QPushButton sizeHint recalculation bug.jasplin2009-06-292-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch causes the size hint of QPushButton to be recalculated in cases where the value of the autoDefault property may have changed due to changes in the ancestor chain. If not explicitly set, the value of the autoDefault property depends on the presence of a QDialog ancestor. Note: The new autotest covers two different use cases related to this behavior. Reviewed-by: janarve Task-number: 255581
| * | Fix license headers after multitouch+gestures merge.Jason McDonald2009-06-2913-65/+65
| |/ | | | | | | | | | | | | Commercial license headers belong in source packages only. The repo must have the pre-release license headers. Reviewed-by: Trust Me
| * Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-2916-45/+45
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5'Thiago Macieira2009-06-282-5/+9
| |\
| | * Fix detection of the ELF interpreter on Linux.Thiago Macieira2009-06-282-5/+9
| | | | | | | | | | | | | | | | | | The path /lib/ld-linux.so.2 is correct for i386 only, possibly some other archs. But on x86-64, it's usually ld-linux-x86-64.so and it can be in either /lib or /lib64.
| * | Merge branch '4.5'Thiago Macieira2009-06-282-3/+21
| |\ \ | | |/
| | * Fix painting errors in QScrollArea on Mac (Carbon)Morten Sørvig2009-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly a stop-gap solution for 4.5.x. It trades painting performance for correct painting. Commit 7988d05da changed the opaque test from q->testAttribute(Qt::WA_OpaquePaintEvent) to qt_widget_private(w)->isOpaque in qt_mac_update_widget_posisiton. This means we'll do optimized moves in more cases. Unfortunately it also causes painting errors in some cases (see the task). Revert the commit for now to put the 4.5 branch in a god shape. Task-number: 252295 Reviewed-by: nrc
| | * Fixed cap and join styles when printing to native Windows printers.Trond Kjernaasen2009-06-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Line and polygon strokes did not respect the join/cap styles set on a painter. Task-number: 256914 Reviewed-by: Samuel
| * | Fixed link error of some test tools due to multiply definedRohan McGovern2009-06-271-0/+1
| | | | | | | | | | | | QTest::touchEvent().
| * | Fixed compile on Unix.Rohan McGovern2009-06-271-0/+1
| | | | | | | | | | | | | | | Fixes error: src/gui/kernel/qevent_p.h:62: error: invalid use of incomplete type ‘struct QKeyEvent’
| * | QMenu: refactor for the QWidgetActions' widget.Thierry Bastian2009-06-262-30/+24
| | | | | | | | | | | | | | | We now use QList/QVector over QHash. It is more efficient because most of the time we iterate over the list of actions anyway.
| * | QMenu: refactor of the update of the geometry to have one central placeThierry Bastian2009-06-262-183/+144
| | | | | | | | | | | | of calculation (ie. updateActionRects)
| * | QMenu: Fixed a painting regressionThierry Bastian2009-06-262-7/+14
| | |
| * | Silenced a warning caused by (apparently) a gcc 4.3 bug:Thiago Macieira2009-06-263-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | gcc 4.3 and 4.4 keep giving us a warning like: 'function()::type' declared with greater visibility than the type of its field 'function()::type::subtype' This seems to be a gcc bug. See the bug report for more information: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40145
| * | Silence trivial warningsThiago Macieira2009-06-262-4/+6
| | |
| * | Fixed a gcc 4.4 warning on switching a value outside the enum.Thiago Macieira2009-06-262-8/+13
| | | | | | | | | | | | | | | These four enum values are used in variables of type Section, but aren't in it. With gcc 4.4, it displays a warning that the value is lower than the lowest value
| * | De-export the ThreadEngineBarrier class and de-inline the call to acquire.Morten Sørvig2009-06-262-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ThreadEngineBarrier was implemented in the header as ThreadEngineSemaphore in Qt 4.4 and Qt 4.5, and exported for a brief time in the Qt master branch. ) Unfortunately the inline call to acquire means that applications compiled with Qt 4.4. and Qt 4.5 will contain a copy of the old implementation. This is BC as long as the memory layout of the ThreadEngineBarrier class stays the same, which means that we keep the QMutex member variable. The old version of acquire will no longer be thread-safe since the new version doesn't lock the mutex, but this is fortunately not a problem; the only place it's called is in startAsynchronously() before the worker threads are started.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-3/+3
| |\ \
| | * | qtscript meta-object binding: enum properties are not deletableKent Hansen2009-06-261-3/+3
| | | |
| * | | Compile on WinCEBradley T. Hughes2009-06-261-6/+8
| |/ / | | | | | | | | | | | | | | | | | | Replace the SIZE constant with an Enum with a Qt-ish CamelCased name (since SIZE conflicts with the system headers). Reviewed-by: TrustMe
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-1/+1
| |\ \
| | * | QMenu: fixed regression in autotestThierry Bastian2009-06-261-1/+1
| | | |
| * | | Cleanup includes in public headers.Bradley T. Hughes2009-06-268-6/+7
| | | | | | | | | | | | | | | | We don't want to pull in too much if we can avoid it.
| * | | CompileBradley T. Hughes2009-06-261-10/+10
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-57/+19
| |\ \ \ | | |/ /
| | * | Clean up QSharedPointer cast implementations.Thiago Macieira2009-06-261-57/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to have separate cast-checker functions, plus the cast- and centralise the function to create the object. Reviewed-by: TrustMe
| * | | Don't always send spontaneous events to QGraphicsSceneBradley T. Hughes2009-06-261-5/+17
| | | | | | | | | | | | | | | | | | | | Only do that if the original event delivered to the QGraphicsView was also spontaneous.
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-264-92/+123
| |\ \ \ | | |/ /
| | * | QMenu refactor to simplify a bit geometry calculationThierry Bastian2009-06-262-90/+92
| | | |
| | * | Add some macro expressions to qglobal.h for typeof, alignof and aligned().Thiago Macieira2009-06-261-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions aren't used anywhere yet, but I am sure we will find use for them very soon now. I checked the compiler manuals for the three commercial Unix compilers to verify which versions support these macros. Reviewed-by: Bradley T. Hughes
| | * | QVariant::setValue had a bug when changing its typeThierry Bastian2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If it was shared and you then set it back to an int type, it is still marked as shared,. This might even lead to crashes. The patch was sent through gitorious by Jürgen Starek. Note: autotest added as well
generated by cgit v0.12 at 2024-11-18 16:16:25 (GMT)