summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Some ifdefs for debugging clipping performanceGunnar Sletta2009-04-201-0/+36
|
* BT: Fix a crash when using Q(File)Dialog::open() in QCocoa.Norwegian Rock Cat2009-04-201-1/+4
| | | | | | | | If we don't have a sheet, we need to recreate it in Cocoa. Unfortunately, we neglected to reassign the NSWindow pointer in that case, so the program would crash. Reviewed-by: Richard Moe Gustavsen
* fix compilation of QtWebKit with Visual StudioJoerg Bornemann2009-04-201-1/+6
| | | | | | | | | | | | | | | Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and 014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual Studio / IncrediBuild. The problem is as follows: QtWebKit has too many entries in INCLUDE_PATHS. In moc.prf is a rule that builds a mocinclude.tmp that contains command line options for moc. moc gets then called with @mocinclude.tmp. Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp, which is necessary for parallel MinGW builds. Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET. See task 189914. Once this task is solved, this commit must be reverted. Reviewed-by: joao
* Fixes over-verboseness in OCI tables function.Bill King2009-04-191-2/+2
| | | | | Differring case of username shouldn't mean adding the username on front. Also fixes autotest failures.
* Miscellaneous cleanups for Sql tests.Bill King2009-04-191-12/+31
|
* Make temporary files close-on-execOswald Buddenhagen2009-04-181-0/+11
| | | | Reviewed-By: thiago
* sanitize whitespace & parenthesesOswald Buddenhagen2009-04-181-128/+127
|
* Run syncqt when available and necessaryDirk Mueller2009-04-181-1/+1
| | | | | | | | | The nightly public snapshots contain bin/syncqt but do not contain the include/ directory. Hence configure needs to detect this case and run syncqt to create the include tree so that configure actually passes Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
* Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-1866-7450/+22935
| | | | | | | | | | | | | | | | | Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission.
* Fix an endianess issue with 32 bit pixmaps on big endian systems.Trond Kjernåsen2009-04-171-1/+1
| | | | | | | | On big endian systems with Xrender, the QPixmap::toImage() function did an unnecessary byte swap for 32 bit pixmaps. Task-number: 196152 Reviewed-by: Samuel
* compilePaul Olav Tvete2009-04-171-1/+1
| | | | | heh, it was perfectly safe to remove the QT_VERSION ifdefs, but QT_VERISON was another matter...
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-171-1/+1
|\
| * autotest didn't compile with gccThierry Bastian2009-04-171-1/+1
| |
* | BT: Obsolete license textJason McDonald2009-04-171-6/+0
|/ | | | | | | | | In the docs, index.html had a statement about licensing that is no longer true, plus the file it linked to longer exists. This change removes the offending paragraph from the docs. Task-number: 251348 Reviewed-by: Carlos Duclos
* Compile.Jan-Arve Sæther2009-04-171-3/+3
|
* Possible assert when hiding tabbed QDockWidgetThierry Bastian2009-04-172-3/+35
| | | | | | | | | The problem is in QTabBar which emits the currentChanged signal before accessing its own internal data. As we react to that signal by possibly removing/adding tabs, it can cause a assertion failure. Task-number: 251184 Reviewed-by: ogoffart
* BT: Make native QFontDialog work when using show and changing windowsNorwegian Rock Cat2009-04-171-3/+5
| | | | | | | | | Cocoa's font manager uses "first responder" which is a great idea, but breaks as soon as we change windows. Thankfully we can just set the target and we are OK. An upshot is that we don't need the delegate, but I'm not going to push my luck on that. Reviewed-by: Richard Moe Gustavsen
* Display error with QTableView with custom default row heightThierry Bastian2009-04-173-8/+50
| | | | | | | QHeaderView can sometimes display holes when using default row height Task-number: 248050 Reviewed-by: ogoffart
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-171-238/+273
|\
| * Even more cleanups on the Change Log.Kavindra Devi Palaraja2009-04-171-165/+185
| | | | | | | | | | Reviewed-by: TrustMe BT: Yes
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-177-178/+11
| |\
| * | More cleanups on the change log.Kavindra Devi Palaraja2009-04-171-90/+105
| | | | | | | | | | | | | | | Reviewed-by: TrustMe BT: Yes
* | | Fix a couple more unmaintained version numbers.Jason McDonald2009-04-172-2/+2
| |/ |/| | | | | | | | | | | I have now inspected all 4.x.y version numbers appearing in the depot. All remaining instances appear to be acceptable. Reviewed-by: Trust Me
* | Fix obsolete version number in docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | | | | | Replace with %VERSION%, so we don't need to fix this for every release. Task-number: 251417 Reviewed-by: Trust Me
* | Fix obsolete version number in docs.Jason McDonald2009-04-171-3/+1
| | | | | | | | | | | | | | Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me
* | Wrong version number in windows installation doc.Jason McDonald2009-04-171-1/+1
| | | | | | | | | | | | | | | | Doc still referred to 4.4.0-rc1 - replace with %VERSION% so we don't have to keep updating this. Task-number: 251419 Reviewed-by: Trust Me
* | Remove out-of-date Cocoa known issues page.Jason McDonald2009-04-171-168/+0
| | | | | | | | | | | | | | | | This page is not linked from anywhere, and its content is horribly out-of-date. Task-number: 251420 Reviewed-by: nrc
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-171-1/+4
|\ \
| * | Line edit displays garbage when pressing up or down arrow keys (Cocoa).Prasanth Ullattil2009-04-171-1/+4
| |/ | | | | | | | | | | | | | | | | The unicode characters between 0xF700 & 0xF8FF are special function-key code characters used by the NSEvent. These characters have to be ignored when converting to a QString. Task-number:244486 Reviewed-by:nrc
* | Fix incorrect year and version number in assistant docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | Task: 251421 Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-179-21/+42
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-175-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 450331808bfe11b1472c213a8cb311190355c2de ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-04 Simon Hausmann <simon.hausmann@nokia.com> Unreviewed Qt build fix. Changed ASSERT(image) to ASSERT(!image.isNull()). * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::getImageData): ++ b/WebKit/qt/ChangeLog 2009-03-07 Adam Treat <adam.treat@torchmobile.com> Reviewed by Cameron Zwarich. These methods are clearly returning the wrong values as the two were returning swapped information. * Api/qwebpage.cpp: (QWebPage::totalBytes): (QWebPage::bytesReceived):
| * Add my bugfix.Ariya Hidayat2009-04-171-0/+1
| |
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-17210-2891/+3388
| |\
| * | Fix management of svg iconsJarek Kobus2009-04-173-17/+17
| | | | | | | | | | | | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | BT: Fix version number in FAQ.txt.Jason McDonald2009-04-171-1/+1
| |/ |/| | | | | | | | | | | | | Don't state a specific version number, or we'll keep forgetting to update it. Task-number: 251338 Reviewed-by: Trust Me
* | Allow -help to be used in a non-eval package.Lincoln Ramsay2009-04-171-2/+2
| | | | | | | | | | | | | | | | The previous logic caused a license check when the eval license file was missing. Reviewed-by: Jason McDonald Task-number: 251339
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Rhys Weatherley2009-04-171-5/+4
|\ \
| * | BT: Whats new doc page has a link to changes-4.5.0 file instead of 4.5.1Jason McDonald2009-04-171-5/+4
| | | | | | | | | | | | | | | | | | | | | Restore the text that is omitted for a minor release but included in patch releases. Also fixes obsolete link to changes files. Reviewed-by: Trust Me
* | | Document my QGLFramebufferObject changeRhys Weatherley2009-04-171-0/+3
|/ /
* | Fixes long strings getting truncated by the ODBC Driver.Bill King2009-04-162-1/+35
| | | | | | | | | | | | | | This test has always been wrong/confusing. Fix it to work, and make sense. Task-number: 250026 Revby: Lincoln Ramsay
* | Document my changes for 4.5.1Rhys Weatherley2009-04-161-0/+6
| |
* | Use setContentsMargins() instead of setMargin().Jan-Arve Sæther2009-04-161-2/+2
| | | | | | | | setMargin() is deprecated.
* | CompileOlivier Goffart2009-04-161-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | QSortFilterProxyModel: In dynamic filter model, childs of temporarlyOlivier Goffart2009-04-162-1/+55
| | | | | | | | | | | | | | | | | | | | filtered items are not correctly updated. when filtering away a row, we should remove all the mapping of the children Task-number: 251296 Reviewed-by: Marius Bugge Monsen
* | BT:Stop widgets disappearing in unified when clicking the toolbar buttonNorwegian Rock Cat2009-04-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment in the code pretty much says it all, so I'll repeat it: This is a workaround for NSToolbar. When a widget is hidden by clicking the toolbar button, Cocoa reparents the widgets to another window (but Qt doesn't know about it). When we start showing them, it reparents back, but at this point it's window is nil, but the window it's being brought into (the Qt one) is for sure created. This stops the hierarchy moving under our feet. Task-number: 251294 Reviewed-by: Prasanth Ullattil
* | Remove some warningsNorwegian Rock Cat2009-04-161-2/+2
| | | | | | | | These aren't used in Carbon, so don't reference them.
* | First round of change log cleanups.Kavindra Devi Palaraja2009-04-161-35/+46
| | | | | | | | | | Reviewed-by: TrustMe BT: Yes
* | Phonon autotest - checking if the backend plugin is actually deployedThomas Hartmann2009-04-161-2/+16
| | | | | | | | | | | | | | | | In tst_mediaobject we check now explicitly if the backend plugin is deployed to the device. Since this check is done in initTestCase we also avoid a crash if the check fails. Reviewed-by: Maurice
* | log my changesOswald Buddenhagen2009-04-161-2/+14
| |