summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-20154-492/+1185
|\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * Silence warning by MSVC.Frans Englich2009-05-201-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * Revert focus apparance on itemviews for X11Jens Bache-Wiig2009-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | We changed this primarily for the mac as active appearance on widgets in itemviews should depend on the window activation state and not on the focus widget. It was explicitly added back for windows only but has been reported as a bug on X11 as well so we might as well keep it mac-only for now. Reviewed-by: mortens
| * Remove bad documentation about window modality and QMessageBox.Norwegian Rock Cat2009-05-201-9/+4
| | | | | | | | | | | | QMessageBox is like QDialog. It doesn't have any extra magic with window modality on creation, so don't advertise that it does. The note about using message boxes as sheets is also updated.
| * qdoc: I overwrote the commit template.Martin Smith2009-05-201-6/+8
| |
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-202-15/+21
| |\
| | * make QSslSocket test work also for shadow buildsPeter Hartmann2009-05-202-15/+21
| | | | | | | | | | | | | | | | | | | | | ... by being able to load the certificates also in a shadow build directory Reviewed-by: Thiago
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2043-140/+245
| |\ \ | | |/
| | * Fix a crash where QCocoaWindow get events after its widget is deadNorwegian Rock Cat2009-05-202-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invariant that QCocoaWindow's lifetime is contained in a QWidget is simply not true. A top-level QWidget gets associated with a QCocoaWindow (which is reference counted). However, it can be the case that we've destroyed our QWidget, the link is removed, the window is hidden, but the window still gets an event. In that case we would crash with an eventual null pointer access. However, we don't really need to do anything in this case, so just call super and return. Task-number: 253402 Reviewed-by: Morten Sørvig
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-05-202-6/+12
| | |\
| | | * Fix parsing method calls with null arguments in Java codeEskil Abrahamsen Blomfeldt2009-05-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Java, "null" is represented as a keyword, not as the integer 0. The old code assumed the latter. Code such as translate("fooBar", "fooBar", null); would thus not be detected by lupdate when parsing Java files. Reviewed-by: ossi
| | | * Fix a typo in the class documentation for QItemDelegateAndy Shaw2009-05-201-1/+1
| | | |
| | * | Fix incorrect copyright year in some license headers.Jason McDonald2009-05-2011-11/+11
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| | * Optimize QIoDevice::readAll() to possibly do less (re)allocationsMarkus Goetz2009-05-201-3/+4
| | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Peter Hartmann Reviewed-by: João Abecasis
| | * Fixes a memory leak in the interbase sql driver.Bill King2009-05-201-4/+3
| | | | | | | | | | | | | | | | | | As suggested in gitorius merge request 421, solution supplied by Harald. Reviewed-by: Harald Fernengel
| | * Added auto-test for QComboBox::setItemDelegate and task 253944Stian Sandvik Thomassen2009-05-201-0/+24
| | |
| | * Adds thread initialisation/cleanup code to mysql.Bill King2009-05-201-0/+8
| | | | | | | | | | | | | | | | | | Allows for cleaner multi-thread working for mysql clients. Task-number: 253407
| | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-194-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 40b523e9eaaba38c182e5a9c319f0069ebf98330 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-05-11 Yael Aharon <yael.aharon@nokia.com> Reviewed by Holger Freyther. Change Qt port to match the mac and windows ports, and unregister plugins when plugins are stopped. Not doing that can cause assersion failure. https://bugs.webkit.org/show_bug.cgi?id=25702 * plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::stop):
| | * Revert commit a372fc602a3cb09379875ced99ec969c371917d7.Ariya Hidayat2009-05-196-695/+1645
| | | | | | | | | | | | This was accidentally committed.
| | * Mentioned the new fancy browser example in the changes-4.5.2.Ariya Hidayat2009-05-191-0/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-196-1645/+695
| | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 7b8d6ab6f2b73862d11c2a41ab0223e55585d88f ) Changes in WebKit since the last update:
| | * Revert "Makes the layout of many of the areas be in aligned columns to ↵Simon Hausmann2009-05-191-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | immensely increase readability" This was pushed accidentially. This reverts commit ffecdf0bf9f25f7ab9aa4f69e37507dd595fecea.
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-19982-29740/+31747
| | |\
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-19982-29740/+31747
| | | |\
| | | | * qwidget autotest fixed for Windows CEJoerg Bornemann2009-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translucentWidget: On Windows mobile the ColorRedWidget is initially moved to the taskbar position where it cannot be grabbed. Reviewed-by: mauricek
| | | | * make the changedSignal test more robustKent Hansen2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms (e.g. Mac) it's not sufficient to call processEvents() only once. Reviewed-by: Andreas Aardal Hanssen
| | | | * Fix stopping link loops in QDirIterator on WindowsEskil Abrahamsen Blomfeldt2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currentFileInfo is only used for returning from the public functions since the file info used in the algorithm is one step ahead. nextFileInfo is the one actually used in the algorithm. The bug was introduced in a compile fix for Windows and broke the stopLinkLoop test for QDirIterator. Reviewed-by: Olivier
| | | | * Adpot more code to use QtNetworkSettings instead of hard coded names.Frans Englich2009-05-196-55/+54
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | | | * Use QtNetworkSettings for IMAP server, instead of hard coding.Frans Englich2009-05-192-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | | * Use QtNetworkSettings, don't hard code IMAP host name. This should fix ↵Frans Englich2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | failures in Berlin.
| | | | * Fix webkit import on cygwin and gentooSimon Hausmann2009-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use .XXXXX in mktemp. Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Nils Christian Roscher-Nielsen2009-05-192-8/+8
| | | | |\
| | | | | * network autotests: do not use imap.troll.no for testingPeter Hartmann2009-05-192-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... but use the test server instead Reviewed-by: Frans Englich
| | | | * | Clarifying what QLocale::C is and is notNils Christian Roscher-Nielsen2009-05-191-2/+2
| | | | |/ | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * Don't "hope" that a connection gets picked up; do it right!Norwegian Rock Cat2009-05-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While downloadProgress and uploadProgress both work on local files. There still may be a delay before the connection is actually picked up. This usually is caught by the processEvents(), but could be missed. Therefore, do a wait if we don't have any pending connections and work in ALL cases. Reviewed-by: Markus Goetz
| | | | * grabWindow in MacGui test was grabbing the wrong area.Norwegian Rock Cat2009-05-191-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think grabWindow was borken and we were compensating for it in the auto test. Now that it works as documented our workaround broke. Reviewed-by: Morten Sørvig
| | | | * qmake autotest: Remove dependency on Qt3 Support on WindowsJoão Abecasis2009-05-191-4/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache
| | | | * make splitter autotest pass on mac tooKent Hansen2009-05-191-3/+2
| | | | | | | | | | | | | | | | | | | | It's not enough to call processEvents() just once on all platforms.
| | | | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-193-11/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 7b8d6ab6f2b73862d11c2a41ab0223e55585d88f ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-03-27 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=24746 Improved selection tests. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::textSelection):
| | | * | Doc: Added a note about copying by value in QMetaProperty and included ↵David Boddie2009-05-191-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | details about BlockingQueuedConnection in QMetaObject::invokeMethod(). Task-number: 187869 Task-number: 216742 Reviewed-by: Thiago Macieira
| | * | | Doc: Added a note about copying by value in QMetaProperty and included ↵David Boddie2009-05-191-3/+15
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | details about BlockingQueuedConnection in QMetaObject::invokeMethod(). Task-number: 187869 Task-number: 216742 Reviewed-by: Thiago Macieira
| | * | Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().David Boddie2009-04-011-6/+10
| | | | | | | | | | | | | | | | | | | | Task-number: 240164 Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
| | * | Doc: Updated the deployment documentation with the QtScriptTools module and ↵David Boddie2009-04-011-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | references to Phonon documentation. Task-number: 212939 Reviewed-by: TrustMe
| | * | Doc: Trivial fixes.David Boddie2009-04-011-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Doc: Minor language fixes and tidying.David Boddie2009-04-013-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5David Boddie2009-04-0129-351/+268
| | |\ \
| | * \ \ Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5David Boddie2009-03-312-33/+30
| | |\ \ \
| | * | | | Doc: Fixed the screenshots and example description to match the code.David Boddie2009-03-313-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 242369 Reviewed-by: TrustMe
| | * | | | Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5David Boddie2009-03-3125-116/+742
| | |\ \ \ \
| | * | | | | Doc: Made it clearer that QProcess::start() only starts a new process if one ↵David Boddie2009-03-311-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not already running. Task-number: 231513 Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-09-23 02:29:08 (GMT)