summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-0821-112/+446
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Mac: play music from CD does not work in PhononRichard Moe Gustavsen2009-06-086-83/+313
| | | | | | | | | | | | ...because it was never implemented. This patch does that. Task-number: 255377
| * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * My changes for 4.5.2Jarek Kobus2009-06-081-0/+4
| |
| * Set the error to be HostUnreacheable if WSAEHOSTUNREACH is recievedAndy Shaw2009-06-081-0/+5
| | | | | | | | | | | | | | This was a contribution sent via the public bugs channel. Task-number: 255161 Reviewed-by: Marius Storm-Olsen
| * Ensure that the manifest files are placed correctlyAndy Shaw2009-06-082-6/+10
| | | | | | | | | | | | | | | | If OBJECTS_DIR was empty then it would create a directory for the manifest files in the root directory. This is not desired as it should create a directory in the build directory instead. Reviewed-by: Marius Storm-Olsen
| * Add a comment for the translator so the placeholders are describedAndy Shaw2009-06-061-0/+3
| | | | | | | | Reviewed-by: TrustMe
| * Fixed typos.Trond Kjernåsen2009-06-051-2/+2
| |
| * My 4.5.2 changes.Trond Kjernåsen2009-06-051-1/+43
| |
| * explicitly handle windows and mac9 line endingsOswald Buddenhagen2009-06-051-5/+20
| | | | | | | | | | | | in practice, this matters only for backslashed line continuations Task-number: 255336
| * Fixed an issue with graphicssystem raster on 8 and 16 bit X servers.Trond Kjernåsen2009-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | We didn't actually check the depth of the target window before calling the qt_x11_drawImage() fu, that will only work with depths >= 24. Task-number: 255311 Reviewed-by: Samuel BT: yes
| * Doc - fixed a typoKavindra Devi Palaraja2009-06-051-2/+1
| | | | | | | | Reviewed-By: TrustMe
| * Doc - fixed another typoKavindra Devi Palaraja2009-06-051-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * Doc - fixed a typoKavindra Devi Palaraja2009-06-051-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * My changes for 4.5.2.jasplin2009-06-051-0/+18
| |
| * My changes for 4.5.2Thomas Hartmann2009-06-051-1/+3
| |
| * Revert "BT: Fixed crash on Mac caused by erroneous handling of native focus ↵jasplin2009-06-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | events." This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e. As reported by Eike, this patch caused several problems for Qt Creator. Potentially it may cause problems for other (external) applications as well. An alternative fix (scheduled for 4.5.x) needs to be found for tasks 254456 and 254460. Reviewed-by: Richard Moe Gustavsen
| * Example MDI: keybord focus not working correctly!Richard Moe Gustavsen2009-06-051-1/+7
| | | | | | | | | | | | | | | | | | The reason is that cocoa looses the first responder when we raise the fake window inside the MDA area. So we need to re-set the first responder again Task-number: 255040 Reviewed-by: Trenton Schulz
| * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| | | | | | | | | | | | | | | | | | | | | | There were several problems with antialiased text in 16 bit mode under Windows. No gamma correction was done, yet we prepared the cached glyphs for gamma correction. The mask format we rendered the glyphs into was also set to the desktop depth, which implied that information was lost and the text looked rather odd. Reviewed-by: Samuel BT: yes
| * Doc - fixed a typoKavindra Devi Palaraja2009-06-051-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * Autotest: Fixed a race condition in the network self test.Thiago Macieira2009-06-051-6/+0
| | | | | | | | | | | | | | | | | | | | Some of the tests (including the httpsServer one) requested that the server close the connection (Connection: close). It could happen that, well, the server did close the connection and we noticed it while doing the waitForBytesWritten in the doSocketFlush function. Then we'd create an error in the next step because the socket wasn't connected. Reviewed-by: TrustMe
| * Doc - cleaned up a sentence to improve clarityKavindra Devi Palaraja2009-06-051-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * My changelog for 4.5.2Alexis Menard2009-06-051-0/+11
| |
| * Make sure to retain alpha information in copyAnders Bakken2009-06-041-3/+4
| | | | | | | | | | | | We need to set alpha to the right value when copying pixmaps. Reviewed-by: Donald <qt-info@nokia.com>
* | Revert signal emission order in QTextDocument to 4.5 behaviourmae2009-06-082-3/+11
| | | | | | | | | | | | | | This is covered by the autotest tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() Reviewed-by: con
* | Extend auto test to cover the emission order of the contentChange() andmae2009-06-081-0/+32
| | | | | | | | | | cursorPositionChanged() singals of QTextDocument. The contentChange() signal is used for the syntax highlighter.
* | Made QTreeWidgetItem::operator<() check if the data is numerical when comparing.J-P Nurmi2009-06-083-3/+35
| | | | | | | | | | | | | | More information in task 166873. Merge-request: 514 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-0830-33/+59
| | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Make QCharRef known to QStringBuilder.hjk2009-06-082-4/+14
| |
* | Use QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION in qdoc3.hjk2009-06-081-0/+2
| | | | | | | | | | Reduces the number of qmalloc calls by 9% and reduces the instruction count as reported by valgrind by 2% in a release build.
* | New binaryMarius Storm-Olsen2009-06-081-0/+0
| | | | | | | | | | Fixes the no qconfig.h output issue in main Reviewed by: trustme
* | make moc-generated code compile againKent Hansen2009-06-081-0/+2
| | | | | | | | Needed due to commit 4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e
* | make signal handlers understand QVariant againKent Hansen2009-06-052-3/+47
| | | | | | | | | | | | Also, issue a warning if a type is not known to the meta-type system. Task-number: 248129
* | have QScriptValue::toVariant() convert Array objects to QVariantListsKent Hansen2009-06-053-0/+24
| | | | | | | | | | | | | | Converting the array to its string representation is not very useful. Now round-trip conversion will work as well. Reviewed-by: Ariya Hidayat
* | Revert two of my commits, restoring the original fix for focus handling.Denis Dzyubenko2009-06-052-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix that was introduced adds regressions, and I don't see a way we can fix it without breaking someone elses code. So restoring the original fix that just avoid a crash (autotest by Thierry is included). Revert "Revert Avoid a crash when setting a focus in a widget hierarchy containing" Revert "Setting a focus on a widget hierarchy which contains both visible and invisible widgets could cause a crash." This reverts commit be833a4f25a8ec8c3dd7a8ac4fa4b0507c93e7ee. This partially reverts commit 1a7da7096bbda17197738061902f4489af234bc0 Reviewed-by: Thierry Bastian Reviewed-by: Prasanth Ullattil
* | QNetworkAccessManager: forgot the "since" tag in my previous commitPeter Hartmann2009-06-051-0/+2
| | | | | | | | Reviewed-by: trustMe
* | add HTTP DELETE support to Network Access APIPeter Hartmann2009-06-054-2/+128
| | | | | | | | | | | | | | | | | | added new method QNetworkAccessManager::deleteResource (naming the method "delete" was not possible since it is a reserverd word in C++) and adjusted all the internals necessary. Task-number: 242916 Reviewed-by: Thiago
* | Compilefix for QT_NO_CURSOR in qgraphicsscene.cppThomas Hartmann2009-06-051-0/+2
| | | | | | | | Reviewed-by: Joerg
* | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-052-2/+14
| | | | | | | | | | | | | | | | | | | | | | The check for cleartype in qt_win_read_cleartype_settings() was not correct for Windows Mobile For anti-aliased text rendering we also have to use another pixel format for the native image. Task-number: 249642 Reviewed-by: mauricek
* | kill dead codeKent Hansen2009-06-051-2/+0
| |
* | Fixed compile error with Sun CC 5.5.jasplin2009-06-051-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Add a callback so Qt updates its color stuff when the profile changes.Norwegian Rock Cat2009-06-052-0/+30
| | | | | | | | | | | | | | | | | | We've had a problem with a stale cache for color profiles this should make things work well. We get the callback for each display whether it needs it or not, but honesly I would rather that we update this a few times too many when people change their display profile than not at all. FWIW, this code is inspired from Apple's Tech Note TN2035.
* | handle qreal properties correctly in the meta-object systemKent Hansen2009-06-058-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling, it's possible that the size of qreal for moc itself (host platform) is different from the size of qreal on the target platform. Thus, we should not encode the metatype-id of qreal at moc time. Instead, use QMetaType::QReal in the generated code so that the the property flags are only derived at compile time. We also need to support the pesky QT_COORD_TYPE. In this case, qreal can be _any_ type (not just float or double), so we encode the property type as 0 and have a special check in QMetaProperty::type() that resolves the correct type at runtime. Reviewed-by: Simon Hausmann
* | Fix wrong sizing of toolbars when they have anough spaceThierry Bastian2009-06-053-69/+104
| | | | | | | | | | | | | | | | | | | | What could happen starting with 4.4 is that you could move a toolbar. If you then added actions, the toolbar would grom and make the other toolbars move to the right although it had enough space already to show the newly created actions. Autotest will follow shortly. Task-number: 226060
* | Fixed build issue with Sun CC 5.5.jasplin2009-06-051-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Make QStringBuilder work out-of-the-box if QT_NO_CAST_FROM_ASCII is definedhjk2009-06-052-35/+24
| | | | | | | | | | | | | | | | So far, only operator% was working for concatenation in those circumnstances. Now, defining QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION is enough, so user code will work without any source changes. Reviewed-by: joao
* | Made qmake handle "no_default" config for sub targetsJ-P Nurmi2009-06-051-1/+6
| | | | | | | | | | Merge-request: 395 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Fix for Qt issue #218037 - Add support for the WM_MOUSEHWHEEL message on Windowsminiak2009-06-054-3/+21
| | | | | | | | | | Merge-request: 384 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Compile with Sun CC 5.5.jasplin2009-06-051-1/+1
| | | | | | | | | | | | | | | | An alternative solution is to swap the order of -I../../include and -I../../include/QtOpenGL when compiling the opengl module. Reviewed-by: TrustMe