summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-07-011-1/+9
|\
| * Fixes configure.exe silently disabling cetest even if you asked for itRohan McGovern2009-07-011-1/+9
| | | | | | | | | | | | when paths to the ActiveSync headers/libraries are not set up. Reviewed-by: Michael Goddard
* | OpenVG compile fix - use const_cast instead of static_castRhys Weatherley2009-07-011-4/+4
|/ | | | Reviewed-by: trustme
* Set the focus to a child widget when set on a QGroupBoxBenjamin Poulain2009-06-302-3/+13
| | | | | | | | | When the focus is set on a QGroupBox with the policy NoFocus, the focus should be propagated to one of the child if it accepts the focus. This was failing because QWidget::focusWidget() returns the QGroupBox itself. Task-number: 257158 Reviewed-by: Denis
* add 4.6 specific modifications to linguist tools testsOswald Buddenhagen2009-06-307-2/+123
|
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-30206-14/+6610
|\
| * integrate linguist tool autotests into the qt testsuiteOswald Buddenhagen2009-06-30200-0/+6573
| | | | | | | | Task-number: 218935
| * Fix Toolbars in unified toolbar looking bad Carbon w/Fullscreen changesNorwegian Rock Cat2009-06-301-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the Carbon code when an item went in full-screen, than out with a unified toolbar. In those cases the toolbars would end up getting but into the mainwindow area. The reason this was happening was that we were calling transferChildren() after we had set up our toolbar. This cause problems because we end up pulling the QToolbars right out of the unified toolbar. The easiest way to solve this is to just update the status on it again. This should solve any issues. I also added some logic to avoid calling this too many times in that one case. Luckily, this seems to only affect Carbon. Task-number: 254462 Reviewed-by: Jens Bache-Wiig
| * Doc: Said which formats we support for a QIODevice driven MediaSourceGeir Vattekar2009-06-301-1/+6
| | | | | | | | | | Task-number: 253902 Reviewed-by: Thierry Bastian
| * Doc: Fixed a doc bug in QPlainTextEdit class description.Geir Vattekar2009-06-301-7/+7
| | | | | | | | | | Task-number: 256762 Reviewed-by: TrustMe
| * Doc: About menu on the Mac gets the application name from Info.plist.Geir Vattekar2009-06-302-3/+6
| | | | | | | | | | Task-number: 256818 Reviewed-by: Trenton Schulz
| * fix crash in QLocalServer on WinCE when waitForNewConnection times outJoerg Bornemann2009-06-301-1/+1
| | | | | | | | Reviewed-by: mauricek
* | const ref for foreach()Oswald Buddenhagen2009-06-301-1/+1
| |
* | Doc - some minor fixes on the sentencesKavindra Devi Palaraja2009-06-301-13/+14
| | | | | | | | Reviewed-By: TrustMe
* | add basic tests for QVariant/QObject qtscript integrationKent Hansen2009-06-301-0/+10
| | | | | | | | | | Some of the more advanced tests will fail for non-obvious reasons if these basic assumptions don't hold.
* | Linguist: defers the creation of the QPrinterThierry Bastian2009-06-302-8/+20
| | | | | | | | | | | | | | | | On windows, if your default printer is not reachable it would take a lot of time to fail to construct the print engine. During that time the UI would be frozen on the splash screen. Reviewed-by: ossi
* | QDockArea: remove coverity warningThierry Bastian2009-06-301-1/+1
| |
* | QToolBar: fix coverity warningsThierry Bastian2009-06-303-27/+18
| | | | | | | | I also changed a bit the way the timer for the popup is working
* | doc: Fixed several qdoc error reports.Martin Smith2009-06-301-6/+10
| |
* | Merge branch '4.5'Marius Storm-Olsen2009-06-3027-45/+703
|\ \ | |/
| * Doc: Fixed links that pointed to removed documentation.Geir Vattekar2009-06-301-3/+4
| | | | | | | | | | | | | | | | Information on issues with the icc compiler has been moved in the docs. Redirected links that still pointed to the old location. Task-number: 257039 Reviewed-by: Morten Engvoldsen
| * Compile qmake autotestMarius Storm-Olsen2009-06-301-1/+1
| |
| * QWidget::adjustSize() sends a spontaneous event - Mac OS X CocoaPrasanth Ullattil2009-06-302-2/+12
| | | | | | | | | | | | | | | | The windowDidResize notification now differentiates an internally triggered resize from a user triggered resize. Task-number: 256269 Reviewed-by: Norwegian Rock Cat