summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix Build Failure for Maemo 5 Debug BuildDominik Holland2010-03-101-2/+2
|
* Add ability to read last mod.time for zip entry.Ritt Konstantin2010-03-102-0/+19
| | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Avoid asserting when index passed to QZipReader::entryInfoAt is out of ↵Ritt Konstantin2010-03-101-1/+3
| | | | | | boundaries Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Add isValid() method to QZipReader::FileInfo.Ritt Konstantin2010-03-102-1/+7
| | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Add `QIODevice* device() const` public method to QZip classes.Ritt Konstantin2010-03-103-0/+20
| | | | | | allows to fetch some extra info from the used device (errorString() for ex.) Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-10359-9429/+22149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update qscriptvalueiterator test to expect length property when iterating arrays and strings. - Use EvalExecutable::create() instead of EvalExecutable constructor. The constructor is private. - Reimplement getOwnPropertyDescriptor() in all custom script objects. - Remove all reimplementations of getPropertyAttributes(). It doesn't exist in trunk anymore (getOwnPropertyDescriptor() is used instead). - Remove checkDontDelete argument from deleteProperty() reimplementations. The purpose of this argument was to support deleting properties with attribute Undeletable from C++. But it was quite an invasive patch to JavaScriptCore, and it doesn't seem worth it. If this feature is really crucial it should be re-done upstream. One of the tests needed to be updated so it's not sensitive to the C++ undeletability. - Adapt getOwnPropertyNames() reimplementations to signature change. - Add missing QScriptObject structure flags, otherwise we don't get all virtual calls. - Remove our patch for reporting column numbers in the debugger callbacks. It was just too intrusive. As with the checkDontDelete issue, this should be redone upstream if it's really important. In 4.7, QScriptEngineAgent will always report a column number of 1. Other compilation fixes: - InternalFunction::name() takes an ExecState* argument, not GlobalData* - ScopeChain::globalObject is no longer a function but a member variable - ScopeChainNode constructor takes a GlobalObject argument - Heap::collect() is called collectAllGarbage() - JSValue::strictEqual() takes an ExecState* argument - Debugger::exception() takes a bool hasHandler argument - Debugger no longer reports column number (we decided to drop that patch from JSC) - UString doesn't have operator+=(char*) - Update the autotests to reflect the columnNumber=1 change. - Add helper class to avoid crashing inside JSC. Ever since r52856 in WebKit trunk, this is needed. There are probably a lot of other public API functions that need this guard as well, but I'll add them as they are discovered. - Update mkdist-javascriptcore tag, exclude a few more files. - Set ENABLE_JSC_MULTIPLE_THREADS=0 define on Mac due to r52355 in trunk. Reviewed-by: Simon Hausmann
* Use index-based approach for iterating over JS array propertiesKent Hansen2010-03-101-4/+3
| | | | | | | | Using QScriptValueIterator means that non-index properties of the array will be processed (such as "length" or "foo"), which is something we don't want. Reviewed-by: Aaron Kennedy
* Merge remote branch 'origin/4.7-cutoff' into 4.7Morten Johan Sørvig2010-03-1024-94/+864
|\
| * Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1072-2768/+3233
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| | * Don't wait forever when scanning for wifi networks on win32 fails.Aaron McCarthy2010-03-101-3/+20
| | |
| | * Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0972-2765/+3213
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (82 commits) Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix ...
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-096-14/+727
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't write byte-order-mark after seek() TextCodec on Symbian: use the native symbian backend for text codecs.
| | * | | Don't write byte-order-mark after seek()Paul Olav Tvete2010-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark has been called, but we don't store that information. This commit is an improvement for the default case when generateByteOrderMark is false, and also when seeking to any other position than 0. Task-number: QTBUG-6295 Reviewed-by: Olivier
| | * | | TextCodec on Symbian: use the native symbian backend for text codecs.Olivier Goffart2010-03-095-13/+725
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian, we would use the native textcodec for anything but UTF and Latin1. Some codec that are not present by default in symbian are still present inside Qt, but if there is symbian codecs that exists for those, Symbian codecs have priority. Most of code has been contributed by the Obrit i18n team. Task-number: QT-2471 (Symbian part) Task-number: QT-2627 Reviewed-by: axis
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| | | | * | Updates to qsoundeffect backends.Kurt Korbatits2010-03-094-34/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pulseaudio backend: moved write code out of callback to reduce upload failure (30%->10%) - pulseaudio backend: add recovery code to retry on failed upload - changed delete to deleteLater, unit test was craching on cleanup - qmedia backend: removed connect to mutedChanged and volumeChanged signals, not needed, emitted by main class. Reviewed-by:Derick Hawcroft
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-09463-7555/+17849
| |\ \ \ \ \
| | * | | | | Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/HintTrond Kjernåsen2010-03-0910-40/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| | * | | | | QTreeView: let the dataChanged signal refresh the hasChildren attribute.Olivier Goffart2010-03-091-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is required for the Locals & Watchers view in Creator. Task-number: QTBUG-7115 Reviewed-by: Thierry
| * | | | | Fix alignment of text with negative right bearingEskil Abrahamsen Blomfeldt2010-03-093-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 5364fd96a72c89b281f0540da909fe64d0575ccf and some related changes, we made sure that the natural text width used for calculating bounding rects and line breaks in the text, takes the right bearing of the last glyph into consideration. As a side-effect, this broke alignment of text, as we want to align based on the accumulated advance of the glyphs, not based on the actual width. This is in particular important when aligning monospaced text, since the text can become misaligned if the glyphs extend beyond their advance. The bug was visible e.g. in line numbers ending with 2 in Qt Creator on X11, which would be shifted one pixel to the left compared to other line numbers. Task-number: QTBUG-8864 Reviewed-by: Thorbjørn
* | | | | | QFSFileEngine reduce number of system callsRitt Konstantin2010-03-093-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for isolated calls to QFileInfo::isReadable, isExecutable and isWritable. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | | remove unneeded "permissions normalization" code from QFileInfoGathererRitt Konstantin2010-03-092-38/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the file engine now properly calculates user permissions, there's no need to check the owner and group IDs here. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | | remove unneeded code from QFileInfoRitt Konstantin2010-03-092-55/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we made sure user perms are calculated in file engine this dirty trick goes away...woohoo Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | | QFSFileEngine: Don't use owner's permissions for current user; calculate ↵Ritt Konstantin2010-03-092-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them instead Having this code in the engine allows cleaning up the hack in QFileInfo. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | | In QFSFileEngine::fileFlags call getPermissions() only if entry existsRitt Konstantin2010-03-091-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By calling doStat earlier and avoiding calling getPermissions if stat fails, we can assume doStat has been called inside getPermissions. We can also avoid the workaround for having all permissions set by default. Moved the check for FILE_ATTRIBUTE_DIRECTORY earlier in if condition, which should be cheaper. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | | move permissions calculation code to separate methodRitt Konstantin2010-03-092-28/+37
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
* | | | | Revert 12b6987031be9faee3886d7623888feb4e1762afMorten Johan Sørvig2010-03-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI system found lots of focus-related regressions, this is probably the offending change. (I can't reproduce the regressions locally.)
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0973-2765/+3220
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (80 commits) doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() ...
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-092-8/+33
| |\ \ \ \
| | * | | | Carbon: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native file dialog (and finder) handles bundles (like .app) like normal files rather than directories, unless specified otherwise. But since they are directories at the same time, we skip sending them through the name filters. This patch makes sure that we are more consistent on this matter for the carbon port. Task-number: QTBUG-834 Reviewed-by: msorvig
| | * | | | Cocoa: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native file dialog (and finder) handles bundles (like .app) like normal files rather than directories, unless specified otherwise. But since they are directories at the same time, we skip sending them through the name filters. This patch makes sure that we are more consistent on this matter for the cocoa port. Task-number: QTBUG-834 Reviewed-by: msorvig
| | * | | | Improve performance of QTimer::singleShotMarkus Goetz2010-03-091-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid allocation of QObject and OS timer. Reviewed-by: Olivier Goffart
| * | | | | doc: Fixed several qdoc errors.Martin Smith2010-03-0916-60/+53
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0961-2710/+3147
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding ...
| | * | | use Qt's private mac functions, reduce code redundancyLorn Potter2010-03-091-43/+13
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0861-2676/+3143
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (74 commits) Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. ...
| | | * \ \ Merge remote branch 'origin/4.7' into 4.7Thiago Macieira2010-03-0813-473/+209
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/src.pro
| | | * | | | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| | | | | | |
| | | * | | | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-081-1/+1
| | | | | | |
| | | * | | | Doc: mark methods as internal (as they were in previous releases)Volker Hilsheimer2010-03-081-0/+10
| | | | | | |
| | | * | | | Fixed mouse wheel handling in scrollareas.Denis Dzyubenko2010-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling wheel events in the scrollbar we should ignore the event by default, so that if we cannot scroll it gets propagated (like in QAbstractSlider). Task-number: QTBUG-8325 Reviewed-by: Richard Moe Gustavsen
| | | * | | | Added two missing keys for X11Denis Dzyubenko2010-03-083-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11 XF86XK_LaunchD is mapped to Qt::Key_LaunchF, however x11 keys LaunchE and LaunchF were not mapped to anything. Reviewed-by: Marius Storm-Olsen
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0855-2676/+3123
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (64 commits) Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt ...
| | | | * | | | Carbon: usage of menu bars can cause exceptions to be thrownRichard Moe Gustavsen2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that a function in the Qt menu bar code assumes that windows on screen are NSWindows (which is true for the cocoa-port). But when using carbon, this will fail. This simple patch will fix this. Reviewed-by: msorvig
| | | | * | | | Mac: compile fixRichard Moe Gustavsen2010-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to move the inclusion of qstringbuilder.h after any system headers has been included. Otherwise, strange compile errors occur. Reviewed-by: msorvig
| | | | * | | | Fix buildHarald Fernengel2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dependency was wrong, should be src_webkit instead of webkit Reviewed-by: Tobias Hunger
| | | | * | | | JPEG plugin: Use switch() instead of if()Markus Goetz2010-03-081-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-0796-640/+1468
| | | | |\ \ \ \
generated by cgit v0.12 at 2024-12-24 17:54:25 (GMT)