summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | compile without QT3SUPPORTJoerg Bornemann2009-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | * | | QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 4.6 API review. Reviewed-by: Volker Hilsheimer
| | * | | Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-10-062-0/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | * | tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fixJoerg Bornemann2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need some more time on Windows mobile to receive all events. Reviewed-by: thartman
| | | * | tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fixJoerg Bornemann2009-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must make sure that the graphics view scene is centered to make this test work. On Windows mobile, the widget was too wide and the scene wasn't centered. Reviewed-by: thartman
| | | * | tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobileJoerg Bornemann2009-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test depends on a layout spacing set to 6. The Windows mobile style has layout spacing 8. Reviewed-by: mauricek
| | * | | tst_qnetworkreply: Add ioPostToHttpsUploadProgressMarkus Goetz2009-10-063-0/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a currently failing testcase. Related to task 261806 and others. Reviewed-by: Peter Hartmann
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-0645-300/+1551
| | |\ \ \
| | | * | | Fix crash in QPlainTextEdit when using large fontsEskil Abrahamsen Blomfeldt2009-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using very large fonts, sometimes the scrollbar of the QPlainTextEdit will allow you to do scroll down past the end of the document, in which case the currentBlock in hitTest() is inValid() which caused an assert in currentBlock.next(). Task-number: QT-938 Reviewed-by: mae
| | | * | | Span update after row and column insertion and removal in QTableView.Gabriel de Dietrich2009-10-065-4/+792
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature had not been implemented yet. Auto-test and benchmark included. As a bonus, single cell spans are no longer added to the span collection. Reviewed-by: Thierry Task-number: 245327 Task-number: QTBUG-3610
| | | * | | Small doclet fixThomas Zander2009-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Rev-By: Trust-Me
| | | * | | Fixed an assert occuring on X11 when destroying QPixmaps under GL.Trond Kjernåsen2009-10-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup code for the QX11PixmapData was called incorrectly for QGLPixmapData. Reviewed-by: Samuel
| | | * | | Corrected Qt logo colors.Alessandro Portale2009-10-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the poisonous green by the 'official' one. Took the RGB values from the logos availiable at: http://qt.nokia.com/about/logos-for-download Reviewed-By: TrustMe
| | | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-06316-1921/+3227
| | | |\ \ \
| | | | * | | QParallelAnimationGroup: set the correct state for the animationsThierry Bastian2009-10-063-30/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were cases (now covered by autotests) where the state of the animations could be wrong. Reviewed-by: janarve
| | | | * | | The threshold for system basic timers has changed on windowsThierry Bastian2009-10-062-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks the animations in main window because dragging a dock widget when it is undocked creates another event loop and the Qt events are not processed any more. Reviewed-by: Trust Me
| | | | * | | Optimized window surfaces on X11 by not setting clip in the common case.Samuel Rødal2009-10-062-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to set a clip when the flush only contains a single region. Not setting the clip gives us a slight performance boost. Reviewed-by: Trond
| | | | * | | doc: Fixed a qdoc command that was meant to add emphasisThorbjørn Lindeijer2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was creating another list item.
| | | | * | | implement property getters&setters for setProperty(quint32) overloadKent Hansen2009-10-062-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better that this works rather than asserts. Reviewed-by: Olivier Goffart
| | | | * | | Only build demo-browser 32-bit if Qt was actually built 32-bitTor Arne Vestbø2009-10-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, add same trick for PPC Reviewed-by: MortenS
| | | | * | | Add support for XFCE desktop integrationJens Bache-Wiig2009-10-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XFCE essentially depends on gnome libraries and can use the same integration features we provide for GNOME. Hence we simply treat it as the GNOME desktop environment internally. We can now also use the DESKTOP_SESSION to reliably detect desktop environments since it has been properly standardized, instead of relying on window manager hacks for anything but a fallback. Task-number: QTBUG-4737 Reviewed-by: bhughes
| | | | * | | Add GNOME implementation for native filesystem iconsJens Bache-Wiig2009-10-063-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some code to support native filesystem icons on GNOME. It works by resolving gnome libs and gnome-vfs dynamically, hence we are explicitly running it on GNOME only and not KDE. Even if it would work there as well. We are planning on adding this functionality to the platform plugin as well. Task-number: QTBUG-2195 Reviewed-by: joao
| | | | * | | statemachine: implement cloning of a whole bunch more GUI eventsKent Hansen2009-10-062-202/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using QEventTransition with almost any type of event will actually work, instead of causing an assert.
| | | | * | | Build the demo-browser 32-bit on Mac since there's no 64-bit FlashTor Arne Vestbø2009-10-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | | * | | Fix regression in QUrl: IPv6 hosts should be lowercased like in Qt-4.5.David Faure2009-10-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-Request: 1709 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
| | | | * | | Faster case-insensitive comparison to "file" in QUrl::toLocalFileDavid Faure2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-Request: 1709 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
| | | | * | | Stabilize QWaitCondition test.Olivier Goffart2009-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait a little bit more for thread synchronization Reviewed-by: Brad
| | | | * | | QtScript: Another crash fix on PowerPCOlivier Goffart2009-10-061-2/+1
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on 32bit PowerPC, the integer value and the pointer value are not in the same word leading to crash. So blindly casting between them lead to crashes. Use the new Register::withInt instead Reviewed-by: Kent Hansen
| | | | * | Autotest: add missing copyright attribution for tests copied fromThiago Macieira2009-10-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | kurltest
| | | | * | Prospective build fix for SolarisKent Hansen2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value."
| | | | * | Merge branch '4.5' into 4.6Thiago Macieira2009-10-061-0/+1
| | | | |\ \ | | | | | |/
| | | | | * Autotest: disable the globalObjects test.Thiago Macieira2009-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are not going to fix this in 4.5. I doubt we'll fix it in 4.6 either, so I'll reenable it for 4.7 only.
| | | | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-063-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | jsc-for-qtscript-4.6-staging-06102009 ( 32d226eb14d44f80e9ec96d4ca2c595181eeeca3 )
| | | | * | Unified and increased some lackey timeouts in systemsemaphore test.Janne Anttila2009-10-061-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian OS some timeouts needs to be higher ones, in order to test complete correctly. Reviewed-by: Miikka Heikkinen
| | | | * | Decrease tst_QThreadOnce::multipleThreads test num of thread for SymbianJanne Anttila2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian OS the maximum number of thread per process depends on stack size. With default 8KB stack size you can have 128 threads, with 16KB stack size you can have 64 threads etc. Since all qt threads nowadays have maximum stack size, we need to decrease the amount of threads in this test. Reviewed-by: TrustMe
| | | | * | Increased tst_QSharedMemory::simpleProcessProducerConsumer timout.Janne Anttila2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test fails sometimes in Symbian OS due to fact that lackey has not finished it's task in given time. Increase timeout to same value as used in waitForStarted statement. Reviewed-by: TrustMe
| | | | * | Merge branch '4.5' into 4.6Thiago Macieira2009-10-064-5/+175
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qabstractitemview/tst_qabstractitemview.cpp tests/auto/qcssparser/qcssparser.pro tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | | | * tst_QCssParser::extractFontFamily fix Windows CE font deploymentJoerg Bornemann2009-10-062-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows mobile we usually don't have the "Times New Roman" font. Thus we must deploy and register it, if its not available. Reviewed-by: mauricek
| | | | | * fix tst_QAbstractItemView::task250754_fontChange for Windows CEJoerg Bornemann2009-10-061-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to give Windows mobile some more time to handle all internal timer events. Otherwise QTreeView::updateScrollBars doesn't get called. Reviewed-by: mauricek
| | | | | * Fixing the autotest for other platforms, hopefully...João Abecasis2009-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann
| | | | | * tst_QComboBox::task248169_popupWithMinimalSize() fixed for WinCEninerider2009-10-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the absolute size values for the combobox to desktop dependent sizes. Reviewed-by: Joerg
| | | | | * Bump version number of 4.5 branch to 4.5.4.Jason McDonald2009-10-0511-15/+138
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * Fix regressions in qeventloop, qtimer, and qsocketnotifier autotestsBradley T. Hughes2009-10-053-31/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in Glib's mainloop implementation where some event sources are not "serviced" every iteration of the mainloop context. This breaks an invariant that many tests relied on, so we need to solve the problem. The invariant is that a newly added timer that would normally fire on the next pass of the event loop (liker a zero timer) SHOULD actually fire. We do this by registering 2 timer event sources with Glib's mainloop: one normal priority source and one idle priority source. The idle priority source is the one that will send events most of the time, with the normal priority one taking over only when processEvents() is called manually. Task-number: QT-877 Reviewed-by: jbache Reviewed-by: thiago Reviewed-by: denis (cherry picked from commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57)
| | | | * | Partially revert e58293b3b, re-adding the #ifdef for Qt 4.7Thiago Macieira2009-10-061-0/+4
| | | | | |
| | | | * | Fixed the X11 error output from the demos/boxes demo.Trond Kjernåsen2009-10-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After we started caching the current context internally, it revealed an old bug: when a QGLWidget is reparented under X11, it will get a new window id, but its context will still be bound to the old window, so we need to rebind it. Reviewed-by: Samuel
| | | | * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-062-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | jsc-for-qtscript-4.6-staging-06102009 ( fc2005c87bbbb743eba96041210902fec821a1af )
| | | * | | Changed wording on Symbian introduction doc.Miikka Heikkinen2009-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Executing "perl createpackage.pl" will only work in bin dir, so changed the wording a bit. Reviewed-by: Janne Anttila
| | * | | | Numerical issues on Windows CE caused some image comparisons to fail.ninerider2009-10-061-1/+8
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows CE and possibly Symbian some filtering and blending functions of the SVG renderer will alter different pixels in two otherwise apparently identical images. Until this is not addressed in the renderers an exact image comparison is not alsways successful. Reviewed-by: banana joe
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-06128-132/+169
| | |\ \ \
| | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-10-069-13/+50
| | | |\ \ \
generated by cgit v0.12 at 2024-10-27 14:22:45 (GMT)