summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix build after MR 543 merged.Thiago Macieira2010-04-081-2/+1
| | | | | | | qmlviewer is now called simply qml, and the debugger is not in Qt sources anymore. Reviewed-by: Bradley T. Hughes
* Compile on 10.4.Morten Johan Sørvig2010-04-081-0/+9
| | | | | | | | | (include gl.h, NSBitmapImageRep::CGImage is 10.5+ only) This commmit simply ommits calling DrawImage when compiling or running on 10.4 - clearly not the correct thing to do if we want to support Tiger.
* revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"Kent Hansen2010-04-081-1/+0
| | | | | It actually broke the build on Mac; another cherry-pick missing maybe. Reverted for now.
* Remove expected failures after JavaScriptCore bug fixKent Hansen2010-04-071-5/+0
| | | | Fixed in 9b15ddda2a7db58ca52d4c2597617b532eebd058
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+13
| | | | | | | to javascriptcore-snapshot-07042010 ( 475f8c67522d8b3f3163dc3a6b24d6083fd0ac19 ) https://bugs.webkit.org/show_bug.cgi?id=36742 gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-3/+14
| | | | | | | to javascriptcore-snapshot-07042010 ( 3b44f0650780e009764ddc0aa6eba7234a85aa72 ) Corrected name of (u)int64_t compile time assert. https://bugs.webkit.org/show_bug.cgi?id=36739
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-8/+42
| | | | | | | to javascriptcore-snapshot-07042010 ( 42ad198e900e439f01d2062ad93d03043c68a309 ) https://bugs.webkit.org/show_bug.cgi?id=36511 <rdar://problem/7753498> Safari freezes when using SPUTNIK JavaScript conformance check
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-078-359/+823
| | | | | | | to javascriptcore-snapshot-07042010 ( 499bdb98708eba4bd40532c70179bf45b43ad068 ) Fixed <rdar://problem/7728196> REGRESSION (r46701): -(-2147483648) evaluates to -2147483648 on 32 bit (35842)
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+10
| | | | | | to javascriptcore-snapshot-07042010 ( d4f1bc6ca356cc64e8991533ee293b4a0b196a3a ) Build fix for SPARC. Fix missing macro value.
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-074-2/+27
| | | | | | to javascriptcore-snapshot-07042010 ( f62e6e4f8e3b3a966543f93ad1cb9030ac2988e6 ) Add virtual memory tags for TCMalloc and WebCore's purgeable buffers.
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-0711-10/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-07042010 ( 706b04f3796e60078c28335beb5f24a7b27cd328 ) Fix the Qt build on Mac OS X/Cocoa 64-bit [Qt] Symbian specific getCPUTime implemetation https://bugs.webkit.org/show_bug.cgi?id=34742 Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32) https://bugs.webkit.org/show_bug.cgi?id=34939 Add missing cast for !YARR (PPC) builds. Implement NEVER_INLINE and NO_RETURN for RVCT https://bugs.webkit.org/show_bug.cgi?id=34740 Typedef both JSChar and UChar to wchar_t in RVCT. https://bugs.webkit.org/show_bug.cgi?id=34560 Get rid of WINSCW hack for UnSpecifiedBoolType https://bugs.webkit.org/show_bug.cgi?id=28054 [Qt] use nanval() for Symbian as nonInlineNaN https://bugs.webkit.org/show_bug.cgi?id=34170
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+15
| | | | | | | to javascriptcore-snapshot-07042010 ( a24c08469482ad26321d0d4b777747b3ae33963c ) Date.UTC() should apply TimeClip operation. https://bugs.webkit.org/show_bug.cgi?id=34461
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-2/+13
| | | | | | | to javascriptcore-snapshot-07042010 ( b620465e6f809ddb0f8ed0fb732e9f8498d94755 ) Fix a bug that Math.round() retunrs incorrect results for huge integers https://bugs.webkit.org/show_bug.cgi?id=34462
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-074-8/+31
| | | | | | | | | | to javascriptcore-snapshot-07042010 ( b9992e6339bc2bc30933303d3b888fb7eb4ae778 ) [Qt] WinCE buildfix after r52729 and fix for Q_BIG_ENDIAN typo. https://bugs.webkit.org/show_bug.cgi?id=34378 Buildfix for WinCE + style fixes (TLS_OUT_OF_INDEXES is not defined). https://bugs.webkit.org/show_bug.cgi?id=34380
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-7/+44
| | | | | | | to javascriptcore-snapshot-07042010 ( da4f912a2f648d518628e1066dace894d1da7081 ) [Windows] Fix a bug of round() with huge integral numbers https://bugs.webkit.org/show_bug.cgi?id=34297
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-04-073-6/+16
| | | | | | | to javascriptcore-snapshot-07042010 ( 8662fcc9bb1d374fa10114fe629f18290641cccc ) Remove trailing \ from inline function code https://bugs.webkit.org/show_bug.cgi?id=34223
* Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-0716-84/+219
| | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Fix missing natively supported mime types for help viewer.kh12010-04-073-19/+61
| | | | | Task-number: QTBUG-9651 Reviewed-by: ck
* compile fix for tests/benchmarks/corelib/tools/qvector.cpphjk2010-04-072-37/+1
| | | | This was refering to a file outofline2.cpp which does not exist anymore.
* A minor fix to allow multiple directories in modules name map of syncqtZeno Albisser2010-04-071-1/+2
| | | | | Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-4586
* Doc: update Mac development documentation.Morten Johan Sørvig2010-04-071-2/+12
|
* Carbon: problems closing down native applicationsRichard Moe Gustavsen2010-04-071-19/+24
| | | | | | | | | | When Qt is used as a plugin, Qt always eats the quit event in the application event handler. This patch makes sure we let the event through in that case. And also that we don't catch the following quit apple event. The whole buisiness of quitting down the native application is not the responsibility of Qt when used as a plugin. Reviewed-by: prasanth
* Fix QTextDocument::undo() cursor positioningmae2010-04-072-7/+59
| | | | | | | | | | | When doing block undo operations, QTextDocument used the change position of the last undo command for positioning the cursor. This is incorrect if the last commands are of type QTextUndoCommand::Removed but split because of the text fragments. The bug is highly noticable in creator when inserting snippets and doing undo afterwards. The change adds an auto test.
* Mac: Make universal ppc/x86 builds compile.Morten Johan Sørvig2010-04-071-0/+7
| | | | We need to enable/disable MMX etc at compile time, not at configure time.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-0722-169/+564
|\
| * compile fix for WinCE Armv4iMaurice Kalinowski2010-04-071-0/+4
| | | | | | | | | | | | missing include Reviewed-by: Joerg Bornemann
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-0755-187/+2076
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix non-bootstrapped qmake build comment out variable which is used only by commented out debug code Cocoa: remove hackish code that is no longer needed Cocoa: mouse release event reports wrong button state Autotest: added more tests to macnativeevents (2) Cocoa: send mouse move event upon a mouse enter Autotest: added more tests to macnativeevents qdoc: Added many png, js, and css files for new format. Test case for QMenu::popup() QMenu::popup() code style fixes fix QMenu::popup() qdoc: Added <div> elements to some html output for Fake nodes.
| | * fix non-bootstrapped qmake buildOswald Buddenhagen2010-04-071-0/+2
| | |
| | * comment out variable which is used only by commented out debug codeOswald Buddenhagen2010-04-071-1/+1
| | |
| | * Cocoa: remove hackish code that is no longer neededRichard Moe Gustavsen2010-04-073-57/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | After Carlos' patch (0c442405a9f85), the code in the event dispatcher that tried to restore correct window level (or actually block cocoa from setting the wrong level) can now be removed. Tested on 10.5 and 10.6. Reviewed-by: cduclos
| | * Cocoa: mouse release event reports wrong button stateRichard Moe Gustavsen2010-04-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | If you release the mouse over a non-client area, the following mouse up event contains the mouse button that was released in the 'buttons' state. This is wrong, according to the documentation (and the native events auto test!) Reviewed-by: msorvig
| | * Autotest: added more tests to macnativeevents (2)Richard Moe Gustavsen2010-04-075-14/+136
| | |
| | * Cocoa: send mouse move event upon a mouse enterRichard Moe Gustavsen2010-04-071-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On all platforms, we always send a mouse move event when the mouse enters a widget (if mouse tracking is on, that is). Then macnativeevents auto test revealed that we did not do this for the cocoa port. This patch will fix this. Reviewed-by: cduclos Reviewed-by: prasanth
| | * Autotest: added more tests to macnativeeventsRichard Moe Gustavsen2010-04-079-87/+391
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| | |\ \
| | | * | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the formats don't match the detch is unnecessary as operator= will anyways destroy the detached QImageData and substitute it with the newly created QImageData from convertToFormat. Task-number: QTBUG-9640 Reviewed-by: Trond
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | | * | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of the row is not only decided by the maximum height of the set of glyphs currently being added to the glyph cache, but also the height of the glyphs previously added to the current line in the glyph cache. To minimize the space used, we now calculate the maximum height for glyphs per line, and use this as the vertical advancement when positioning the next line in the cache. The change also removes a redundant test ((c_x + c.w > c.h) is caught earlier on and will always be false at this point.) Task-number: QTBUG-9176 Reviewed-by: Trond
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-066-3/+31
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: update the QDBusPendingCallWatcher example to show where to delete Doc: Remove QDBusServer from the public documentation. [Cocoa] QDialogs with WindowStayOnStopHint parent Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
* | | | | | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-0/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-0716-34/+605
|\ \ \ \ \
| * | | | | Test case for QMenu::popup()miniak2010-04-071-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifies that the menu shown is fully contained on the screen. The actual menu position on the screen is checked as well. Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | QMenu::popup() code style fixesminiak2010-04-071-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | fix QMenu::popup()miniak2010-04-071-4/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Merge-request: 551 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8865