summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-05-255-797/+847
|\
| * Revert "Enable symbol visibility when compiling with RVCT."axis2009-05-252-3/+3
| | | | | | | | | | | | | | This reverts commit c33abd370470a0097cc1fbb858e1218ba110e0df. We will need this patch in the end, but right now it's causing too much trouble with the compiler. To return soon!
| * Factor Symbian specific code into its own file, qlocale_symbian.cpp.Frans Englich2009-05-253-794/+844
| | | | | | | | Reviewed-by: Miikka Heikkinen
* | S60Style: Try to guesstime resolution, if no exact match is found.Sami Merilä2009-05-251-2/+23
|/
* S60Style: Set WA_OpaquePaintEvent off for scrollbars to draw transparency ↵Sami Merilä2009-05-251-3/+19
| | | | correctly.
* S60Style: Use smaller corner size for tooltip.Sami Merilä2009-05-251-6/+8
|
* S60Style: Change QTreeView elements to be non-color-skinnable.Sami Merilä2009-05-252-9/+2
|
* S60Style: Change IsSkinnableDialog method name to drawsOwnThemeBackground.Sami Merilä2009-05-252-6/+5
|
* S60Style: Reorganize methods in source files to match header file order.Sami Merilä2009-05-253-341/+353
|
* S60Style: QScrollArea background is not continuous with main theme ↵Sami Merilä2009-05-231-0/+1
| | | | background (part2).
* S60Style: QScrollArea background is not continuous with main theme background.Sami Merilä2009-05-231-0/+3
|
* S60Style: Draw radiobutton and checkbox indicators with correct color.Sami Merilä2009-05-231-1/+4
|
* S60Style: Build break fix. Missing include added.Sami Merilä2009-05-231-0/+1
|
* S60Style: Fix palette-polution to other styles, when style is switched runtime.Sami Merilä2009-05-222-3/+4
|
* S60Style: If table has defined a new background brush use that instead of ↵Sami Merilä2009-05-221-15/+20
| | | | drawing themed background.
* S60Style: Make 'checkable' buttons just 'pressed down' when checked.Sami Merilä2009-05-221-24/+2
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-222-43/+44
|\
| * Fixes to release package creation scriptMiikka Heikkinen2009-05-221-28/+32
| |
* | Fixed qsslsocket auto test compilation for Symbian.Janne Anttila2009-05-222-16/+20
|/
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-22164-618/+1446
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-22332-14202/+3725
| |\
| | * This is ugly hack to make snedData test case in qlocalsocket to pass.Aleksandar Sasha Babic2009-05-212-1/+6
| | | | | | | | | | | | | | | This definitely has to be reviewed and changed, especially when generic problem with socket notifier and sync operations on sockets is solved.
| | * Long time when waiting in test case will not help in this case.Aleksandar Sasha Babic2009-05-211-3/+5
| | |
| | * Resolving some merge issues.Aleksandar Sasha Babic2009-05-211-2/+2
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-21159-605/+1395
| | |\
| | | * FixesAlessandro Portale2009-05-201-1/+4
| | | |
| | | * Part cache key nitpickAlessandro Portale2009-05-201-1/+1
| | | |
| | | * Fix building on other platforms.Jason Barron2009-05-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of things in SRC_SUBDIRS is important here because src_phonon should be built before src_webkit and src_plugins because those projects might link against Phonon. This should be fixed properly when we merge into 4.6 because Phonon might depend on OpenGL for rendering to a texture hence the comment.
| | | * 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.