summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix for link error when building QtSvgGareth Stockwell2009-11-042-1/+6
| | | | | | | | | | | | | | | | | Building QtSvg for Symbian (ARMV5 build) fails due to the following linker error: QGraphicsEffectSourcePrivate::invalidateCache(bool) const (referred from qsvgwidget.o). This function is called from the inline destructor of QGraphicsEffectSourcePrivate. Making this destructor non-inline fixes the problem. It is not clear why QtSvg is instantiating this destructor, however, as neither QGraphicsEffectSourcePrivate nor any of its derived classes are referred to from QtSvg source. This problem seems to have been triggered by 85e41590. Reviewed-by: Shane Kearns
* QS60Style: QToolButton indicator will not fit into toolbutton areaSami Merilä2009-11-041-5/+8
| | | | | | | | | QToolButton rect does not include reserved area for menu indicator, so drawing the indicator makes the rest of the toolbutton area smaller. Fixed by including the menu indicator area into tool button. Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-044-111/+149
|\
| * Unexported a class that doesn't need to be exported.axis2009-11-043-108/+108
| | | | | | | | RevBy: Iain
| * Fixed input panel detection on post-5.0 S60 SDKs.axis2009-11-042-3/+41
| | | | | | | | | | Task: QT-2418 RevBy: Shane Kearns
* | Make button margins bigger in QS60StyleSami Merilä2009-11-041-0/+7
|/ | | | | | | | | | | Currenly QS60Style relies on QCommonStyle to calculate correct button content size. Unfortunately, common style does not understand frames, so it is possible that the frame-border of theme graphic gets under button content. This change makes both QPushButton and QToolButton bigger. Task-number: None Reviewed-by: Alessandro Portale
* Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-04651-7922/+19074
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-04631-7730/+18163
| |\
| | * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0440-580/+802
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | * Compile fix after the last gesture api changeDenis Dzyubenko2009-11-036-55/+47
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scale the pixmap to correct size (16,16) before setting as the image for the Document Icon button. Reviewed-by: Denis
| | | * Gesture api review.Denis Dzyubenko2009-11-0324-265/+270
| | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | * Modified gesture events propagation.Denis Dzyubenko2009-11-035-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| | | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-038-72/+90
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-038-91/+123
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-033-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| | | * Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-032-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * Cocoa: fix double emit bug from file dialogRichard Moe Gustavsen2009-11-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, Cocoa tells us twize whenever a selection change occurs in the native file dialog. This patch inserts a check that the selection actually changed before emitting any signals Rev-By: Prasanth
| | | * Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standardWindowButton:NSWindowDocumentIconButton will not return a valid NSButton unless you call setRepresentedURL or setRepresentedFilename for the NSWindow. This patch makes sure that setWindowIcon_sys() sets the icon using a valid NSButton. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-10-305-22/+109
| | | |\
| | | | * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-305-22/+109
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Denis
| | | * | Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-302-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataLocation now behaves as on the other platforms, QCoreApplication::organizationName() and applicationName() is included in the returned path.
| | | * | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| | | | |
| | | * | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-4988 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced a regression preventing the mac-spesific standardIcon code form being called. Call the Mac code if desktopSettingsAware is set. (QIcon::themeName() is only set on X11)
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-3043-397/+1344
| | | |\
| | * | | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.6-s60' into 4.6axis2009-11-0425-145/+284
| | |\ \ \
| | * | | | WebKit line ending fix in AccessibilityAllInOne.cpp.Jocelyn Turcotte2009-11-041-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | QVideoFrame API review changes.Andrew den Exter2009-11-042-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
| | * | | | QVideoSurfaceFormat API review changes.Andrew den Exter2009-11-042-54/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename YuvColorSpace enum and related functions to YCbCrColorSpace. Remove ViewportMode enum and make setFrameSize() always reset the viewport to fill the frame. Reviewed-by: Justin McPherson
| | * | | | QAbstractVideoSurface API review changes.Andrew den Exter2009-11-043-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-04523-6070/+15864
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Warwick Allison2009-11-042-6/+17
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-11-041-5/+16
| | | | |\ \ \ \
| | | | | * | | | Fixed lastError() for QTDS driver. Previously, no lastError was available on ↵Mark Brand2009-11-041-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax errors, bad column names, etc. Merge-request: 1987 Reviewed-by: Bill King <bill.king@nokia.com>
| | | | * | | | | Fix trivial qdoc errorJason McDonald2009-11-041-1/+1
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | Declarative building infrastructure.Warwick Allison2009-11-042-0/+18
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Does nothing if no declarative directories installed.
| | | * | | | Implement internal support for property interceptors (used by declarative).Michael Brasser2009-11-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy
| | | * | | | QGtkStyle refactoringRobert Griebl2009-11-0313-1350/+1455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| | | * | | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit compile fix for Windows CE Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman
| | | * | | | Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixed upstream. Reviewed-by: TrustMe
| | | * | | | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850 This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
| | | * | | | Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David BoddieDavid Boddie2009-11-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Added internal or hidden placeholder documentation. Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
| | | * | | | Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago MacieiraThiago Macieira2009-11-031-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement symbol hiding for JSC's JIT functions. These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
| | | * | | | Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago MacieiraThiago Macieira2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking of WebKit on Linux 32-bit. It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
| | | * | | | Re-apply change 0e917ae9587aa0727e6b26ba3eb0157362748fb7 by Jocelyn TurcotteJocelyn Turcotte2009-11-032-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct line ending chars imported from webkit. Reviewed-by: TrustMe
| | | * | | | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David BoddieDavid Boddie2009-11-032-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixed and synchronized QWebView related documentation. Reviewed-by: Trust Me
| | | * | | | Re-apply change 4ce556b952545494a8adb96f628c219a38406562 by Oswald BuddenhagenOswald Buddenhagen2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix line ending
| | | * | | | Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin SmithMartin Smith2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin Smith doc: Changed Trolltech to Nokia
| | | * | | | Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn Turcotte Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
generated by cgit v0.12 at 2024-11-10 22:44:04 (GMT)