summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Small change to make move and replace methods overridable.Erik Verbruggen2009-07-022-3/+9
|
* Remove Content and ContentWrapperAaron Kennedy2009-07-025-310/+0
| | | | property aliases do a better job of this
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-021946-155141/+215113
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-021989-156587/+216714
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * We should wait for component completion before trying to load XmlListModel data.Michael Brasser2009-07-022-6/+13
| | | | | | | | | | | | | | | This gets rid of the meaningless "empty src" warning when the demos using XmlListModel are first started.
| | * Fix warningMichael Brasser2009-07-021-1/+1
| | |
| | * Fix bad mergeMichael Brasser2009-07-022-5/+0
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-021898-154985/+214891
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| | | * OpenVG: short-cut clipping for QPainterPath's that are just rectsRhys Weatherley2009-07-021-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QPainterPath contains a structure that looks like a simple rectangle, then use the faster clip(QRect) function instead of a full VGPath-based render call. Task-number: QT-64 Reviewed-by: trustme
| | | * OpenVG: override QPaintEngineEx::clip(QRect) and handle specially.Rhys Weatherley2009-07-022-2/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change should improve performance of single-rectangle clip regions by avoiding the overhead of creating and intersecting QRegion objects. Task-number: QT-64 Reviewed-by: trustme
| | | * OpenVG: use the correct clip region to detect single-rect clipsRhys Weatherley2009-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Special case: if the intersection of the system clip and the region is a single rectangle, then use the scissor for clipping." It was doing the intersection but then didn't use the intersection to test for the single-rectangle case. Task-number: QT-64 Reviewed-by: trustme
| | | * QAnimation: fix a jump in values when restarting an animationThierry Bastian2009-07-012-26/+26
| | | |
| | | * Animations: adding an autotest for jumping values when restartingThierry Bastian2009-07-011-0/+52
| | | | | | | | | | | | | | | | | | | | The problem is that when restarting, the time is at the end. So the current value changes to the end value instead of the initial value.
| | | * Animation: fixed a NOTIFY signal name that was wrongThierry Bastian2009-07-012-7/+7
| | | | | | | | | | | | | | | | Also slightly updated a demo
| | | * QMainWindow: cleanup of code in QWidgetAnimatorThierry Bastian2009-07-016-107/+66
| | | |
| | | * Doc - some minor fixes to the sentencesKavindra Devi Palaraja2009-07-011-15/+17
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * QNAM: Direct transfer of HTTP buffer to the QNetworkReply bufferMarkus Goetz2009-07-015-13/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Directly put a QRingBuffer from one QRingBuffer to another QRingBuffer. Reviewed-by: Thiago Macieira
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-07-01162-6256/+3010
| | | |\
| | | | * Fixed inheritance of some attributes in SVG.Suneel BS2009-07-015-96/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed inheritance of stroke attributes, the font-size and text-anchor attribute. Autotest added by Kim. Reviewed-by: Kim
| | | | * Remove this stale function.Norwegian Rock Cat2009-07-011-23/+0
| | | | |
| | | | * Implement hitTestNorwegian Rock Cat2009-07-012-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa calls hitTest on our view to determine if the view should get the mouse press. We always said, "yes" and did all the logic ourselves. Turns out that we can say "no" if I'm transparent to mouse events and remove all that code where we do all the work ourselves. Big maintenance win! For the time being I've kept the "transparentViewForEvent" method since it might be useful for others, but no one is using it at the moment and we may just kill it soon. HitTest should handle this situation correctly.
| | | | * Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-012-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to call syncState() to let the paint engine set depth clipping state parameters back to their OpenGL defaults. Reviewed-by: Trond
| | | | * Fixed cleanup of glyph cache textures in the GL 2 engine.Trond Kjernåsen2009-07-012-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could potentially crash when a context was destroyed before the actual font engine holding the QGLTextureGlyphCache was destroyed. Reviewed-by: Samuel
| | | | * Compiler warnings.Bjørn Erik Nilsen2009-07-014-2/+5
| | | | |
| | | | * doc: Changed wording in some stub callbacks.Martin Smith2009-07-011-26/+26
| | | | |
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtNorwegian Rock Cat2009-07-01145-6045/+2570
| | | | |\
| | | | | * Make the macros QT_WA & QT_WA_INLINE only use the unicode partMarius Storm-Olsen2009-07-011-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * examples: QString::fromUtf16() -> QString::fromWCharArray()Marius Storm-Olsen2009-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * tests: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-0120-257/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-013-49/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-019-189/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ↵miniak2009-07-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/tools/idc: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵miniak2009-07-011-53/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/testlib: LPCWSTR -> wchar_t*Marius Storm-Olsen2009-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/qt3support: Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵miniak2009-07-018-724/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/activeqt: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-0112-266/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Also, buffer sizes passed to Registry APIs were incorrect. Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/sql: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-012-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove many #ifdef UNICODE blocks Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/opengl: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-011-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-017-104/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-0150-2919/+1227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also - Make winPeekMessage() & winPostMessage() obsolete - FlashWindowEx, IsValidLanguageGroup functions no longer resolved dynamically (available on >= Windows 2000) - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system icons/cursors - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available (Windows 7) Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * Handle application paths larger than MAX_PATH, and fix potential buffer overflowMarius Storm-Olsen2009-07-012-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These days we can easily get very long paths, so we should support application paths as long as needed. There was also a potention exploit in that if the path was MAX_PATH or larger, the string would not be \0 terminated (see MSDN docs for GetModuleFileName), and thus cause problems in QString::fromWCharArray(). Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-0128-1340/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Also: QString::fromUtf16() -> QString::fromWCharArray() WCHAR & TCHAR -> wchar_t LPTSTR/LPCTSTR -> LPWSTR/LPCWSTR Documentation update Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * src/winmain: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-011-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support Also TCHAR -> wchar_t LPTSTR/LPCTSTRs -> LPWSTR/LPCWSTRs Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | | | | * doc: Fixed several qdoc error reports.Martin Smith2009-07-013-67/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
| | | | * | Never discard TabletRelease events as they may be delivered *after* ↵Cédric Luthi2009-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TabletLeaveProximity events Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | | | * | Fix tablet eventsCédric Luthi2009-07-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tablet events should set the qt_button_down, otherwise if the tablet moves onto a widget that does not accept a tablet event, it will set qt_button_down and effectively "grab" the mouse. However, we should only do this if we accept the tablet event. Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | | | * | Fix a few typosCédric Luthi2009-07-011-5/+5
| | | | |/ | | | | | | | | | | | | | | | | | | | | Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | | | * Added QGraphicsScene::sendEvent().J-P Nurmi2009-07-013-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 787 Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| | | * | Make "make docs" in QTDIR work on Windows, independent of configure ↵Volker Hilsheimer2009-07-012-9/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -debug/release/debug_and_release - build qdoc3 always into tools\qdoc3 rathern than release/debug subdirs - call it from there Reviewed-by: Marius SO
| | | * ItemViews: Fixed signal entered not being emitted when using the mouseThierry Bastian2009-07-013-33/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wheel The solution is to check the the current "entered item" hasn't change also when the scrollbars change values Task-number: 200665 Reviewed-by: janarve