summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-05-119-15/+371
|\
| * Clarifying docs for QTextTable::splitCell()Morten Engvoldsen2009-05-111-1/+6
| | | | | | | | | | | | | | | | Clarifying details about QTextTable::splitCell() regarding splitting and merging over several rows and columns Task-number:193732 Rev-by: Geir Vattekar
| * Update the --help output of qdbusxml2cpp.Thiago Macieira2009-05-111-2/+4
| | | | | | | | | | | | | | Don't say we produce output when no options are passed if we don't. Task-number: 222778 Reviewed-by: Trust Me
| * Don't crash at runtime with when relaying a signal.Thiago Macieira2009-05-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | We have this function called qDBusInterfaceFromMetaObject that calculates the interface name from a given meta object. There's no need to duplicate the code here (and not do it right). All tests still pss. Task-number: 236955 Reviewed-by: Trust Me
| * Document that we don't support NTLM version 2.Thiago Macieira2009-05-111-0/+9
| | | | | | | | | | Task-number: 236925 Reviewed-by: Tor Arne Vestbø
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-1168-12678/+347
| |\
| | * Add a test for UTF-8 conditionsThiago Macieira2009-05-112-0/+312
| | |
| | * Don't leak memory when assigning scriptvalue to iteratorKent Hansen2009-05-112-2/+35
| | | | | | | | | | | | | | | | | | The d-pointer was not deleted as it should be. Reviewed-by: Harald Fernengel
| * | Fixes a code snippet for QPainter::xFormDev()Andy Shaw2009-05-111-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-1113-16/+14
| | |
* | | Compilation for debug buildsOlivier Goffart2009-05-111-12/+11
| | |
* | | Merge branch '4.5'Thiago Macieira2009-05-1164-12676/+0
|\ \ \ | | |/ | |/|
| * | Clean up old Qt 3 stuff.Thiago Macieira2009-05-1164-12676/+0
| |/ | | | | | | Reviewed-By: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-05-1181-108/+365
|\ \ | |/
| * Make sure syncqt creates the Phonon/Global file.Thiago Macieira2009-05-111-0/+5
| | | | | | | | | | The standard Phonon package has this file and it points to phononnamespace.h
| * Add a license file for the XML Conformance Testsuite.Thiago Macieira2009-05-111-0/+59
| | | | | | | | | | | | | | The source of the license text is http://www.w3.org/Consortium/Legal/copyright-software-19980720 Reviewed-by: Trust Me
| * Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
| | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek
| * Fixes qt3support unit tests generating compile failures when Qt is notRohan McGovern2009-05-1153-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | configured with qt3support. The build system knows when qt3support was turned off, so let's just skip these tests in that case. That makes more sense than individually configuring each autotest machine to skip these tests when the configuration is known to turn off qt3support, which is what's done previously. Reviewed-by: Lincoln Ramsay
| * Prevented asynchronous access to non-thread safe libfontconfig API.Samuel Rødal2009-05-081-11/+32
| | | | | | | | | | | | | | | | We need to protect calls to FcCharSetHasChar with the font database mutex. Task-number: 241361 Reviewed-by: Simon Hausmann
| * Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
| * macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-083-14/+9
| | | | | | | | | | | | | | | | Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d Task-number: 253052 Reviewed-by: Norwegian Rock Cat Reviewed-by: MortenS
| * QDataStream: Small doc errorMarkus Goetz2009-05-081-1/+1
| | | | | | | | | | Task-number: 253179 Reviewed-by: TrustMe
| * Fixes a crash in QPrinterDialog with relative filenamesJoão Abecasis2009-05-083-2/+19
| | | | | | | | | | | | | | | | | | | | | | It's better to set the sourceModel in the constructor for QFSCompletor, as requiring that it be set separately is error prone. Surprisingly, the printer dialog crash only appears to happen when using relative filenames. Task-number: 253135 Reviewed-by: alexis
| * Fix QCompleter with UnfilteredPopupCompletionJoão Abecasis2009-05-082-1/+47
| | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a794ded85f74516239a08cf848e6b4f8b6dcac6a. When using UnfilteredPopupCompletion the matchCount is always zero and completion was being skipped. By adding the check for showAll we still avoid the assert but retain correct behavior. Task-number: 253125 Reviewed-by: jasplin
| * Fix leak of file descriptors in QTemporaryFileJoão Abecasis2009-05-083-2/+55
| | | | | | | | | | | | | | | | | | | | | | Using setFileName in QFile::copy (introduced recently) has a nasty side-effect of leaking file descriptors in QTemporaryFile. This happens because the code assumes the file has been closed. In QTemporaryFile, we need to explicitly call native file engine close. Test case by Thiago. Bug report from Arora developers. Reviewed-by: thiago
| * compile?Harald Fernengel2009-05-081-1/+1
| |
| * Added further explanation on the note about stdin and QTextsStream::atEnd()Morten Engvoldsen2009-05-081-2/+4
| | | | | | | | | | | | | | Explained why you cannot use stdin and atEnd() together. Task-number:251171 Rev-by: Andreas Aardal Hanssen
| * Fix reentrency of the QCSS engine.Olivier Goffart2009-05-081-10/+6
| | | | | | | | | | | | | | | | | | QTextDocument which is suposed to be reentrant may use the CSS Parser in different threads. The way the indexOfId was computed is not thread safe. Insert the pre-computed value instead Reviewed-by: Thierry
| * Fix reentrancy of QVector and QStringOlivier Goffart2009-05-082-2/+2
| | | | | | | | | | | | The d->capacity could be modified even if ref was more than 1 Reviewed-by: Marius Storm-Olsen
| * Fixes QDir not reentrantOlivier Goffart2009-05-081-29/+18
| | | | | | | | | | | | | | | | | | | | qt_cmp_si_sort_flags could be read and written from different threads. Use qStableSort with functor instead of libc's quicksort. Found with helgrind on kdevelop Reviewed-by: Marius Storm-Olsen
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-084-8/+9
| |\
| | * Correcting typoMorten Engvoldsen2009-05-081-2/+0
| | | | | | | | | | | | Removing linebreaks in the document
| | * Revert "Added comment to QTextStream - clarification of the documentation"Morten Engvoldsen2009-05-081-2/+1
| | | | | | | | | | | | This reverts commit da1416cef6b1d24156739ded101df895ee4e80d9.
| | * Fixed a problem with QPrinter::NativeFormat printers not being valid.Trond Kjernåsen2009-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | It's obvious that not only PDF and PS printers are valid.. Task-number: related to 252873 Reviewed-by: Samuel
| | * Make the g++-42 mkspec use gcc-4.2 for linking as well.Morten Sørvig2009-05-081-2/+6
| | | | | | | | | | | | | | | | | | Forgot to override the linker, causing it to use gcc 4.0. Reviewed-by: Richard Moe Gustavsen
| * | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-082-13/+14
| |/ | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| * Fixes QIBASE driver crashes on multiple execution of a prepared queryBill King2009-05-072-7/+18
| | | | | | | | Task-number: 246808
* | Fixed resetting error mode on Windows on error when stat'ing a file.Denis Dzyubenko2009-05-111-2/+0
| | | | | | | | | | | | | | | | We shouldn't return since the SetErrorMode was called and we need to reset it back afterwards. Patch-by: ritt.k Reviewed-by: mauricek
* | Faster slot disconnection while destroying of QObjectOlivier Goffart2009-05-112-150/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | Destroying a QObject which is connected to many signals was slow. We had to loop over all the ConnectionsList of all the connected object to remove the connections. (in QObjectPrivate::removeReceiver) The idea is to now use lists of pointer to Connection both in the connection list, and in the list of senders. So clearing the connection should be faster. Task-number: 251097 Reviewed-by: Brad
* | Compile on Mac OS X.Norwegian Rock Cat2009-05-111-3/+8
| | | | | | | | | | | | | | | | The friend thing doesn't really work when it's defined in the class you want to be a friend of, so do the promotion technique instead. Reviewed-by: Thierry Bastian
* | Fixed 71 symbols exported that didn't need to be.Thierry Bastian2009-05-112-2/+2
| |
* | fix build on windowsMaurice Kalinowski2009-05-111-1/+1
| | | | | | | | | | | | - partly revert f0243e70e05a3368582fd0478d840096d6b60c3f as it broke the build due to widgets accessible plugins using QDockWidgetLayout Reviewed-by: Rhys Weatherley
* | removed more exports on private classes (QMouseEventEx and QKeyEventEx)Thierry Bastian2009-05-081-2/+2
| |
* | removing additional unused export to classes only used in QtGuiThierry Bastian2009-05-081-4/+4
| | | | | | | | Reviewed-by: ogoffart
* | Do not export inline private classes in qcssparser_p.hThierry Bastian2009-05-081-7/+7
| | | | | | | | Reviewed-by: ogoffart
* | QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-088-30/+42
| | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
* | Stop a crash in QMenuBar on Designer after my changes.Norwegian Rock Cat2009-05-081-0/+2
| | | | | | | | | | | | In the past, we checked on the existence of the pointer, but now that this is controlled by the property, we need to also check the pointer in the action event.
* | Fixed unwanted merging of undo commands from different edit blocksmae2009-05-083-20/+47
| | | | | | | | | | | | | | | | | | With this patch, commands no longer merge across block bounderies. In order to have merging still work for the normal insertion and deletion case, the unnecessary beginEditBlock()/endEditBlock() calls where cleaned up. Reviewed-by: Simon Hausmann
* | Extend QTextDocument testmae2009-05-081-0/+18
| | | | | | | | This new test tests desired undo merging behaviour after insertions.
* | Fixed leak of plugin instancesJoão Abecasis2009-05-081-1/+18
| | | | | | | | | | | | | | | | | | | | It seems that plugins were never explicitly unloaded, resulting in leaks of the instance object. Added a static deleter to ensure deletion on exit. The QPointer (previously in place) ensures we don't do a double-free nor try to access an invalid pointer. Task-number: 253013 Reviewed-by: mariusSO