summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce a qconfig feature for Bearer ManagementTasuku Suzuki2010-04-1525-3/+115
| | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Remove holes in bearer management data structures.Aaron McCarthy2010-04-158-26/+35
|
* Don't link bearer plugins against QtGui unnecessarily.Aaron McCarthy2010-04-145-5/+5
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1467-1662/+3956
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. ...
| * Added missing newline after warning message when using -L with qmlThorbjørn Lindeijer2010-04-141-1/+1
| |
| * Doc: updating scriptsMorten Engvoldsen2010-04-142-4/+12
| | | | | | | | Revieved-by: trust-me
| * Fixed a crash on embedded due to uninitialized pointer.Denis Dzyubenko2010-04-141-4/+0
| | | | | | | | | | | | | | The pointer is declared on all platforms, so obviously we should initialize and delete it on all platforms as well. Reviewed-by: Paul
| * Fix a race where QThread::exit() is "lost" when called after start()Bradley T. Hughes2010-04-144-38/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 9aa4538b219ed759a47e8d1f93c2797bf07b5e2f and fixes the bug in a different way. If the QThreadData::quitNow flag is set when entering QThread::exec(), allow QEventLoop::exec() to bail out and reset quitNow after QEventLoop::exec() has returned (not before). Task-number: QTBUG-1184 Reviewed-by: olivier
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-147-34/+44
| |\
| | * Autotest failure: dialogModality test fails on cocoa (macgui)Richard Moe Gustavsen2010-04-142-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that it is using accessebility, which is not yet implemented in Qt/Cocoa. This patch just removes the test, and reimplements it using the native events test instead, which is a better solution anyway. Reviewed-by: msorvig
| | * Force the bic test to compile in 32-bit mode on MacMorten Johan Sørvig2010-04-141-0/+3
| | | | | | | | | | | | | | | The stored data is 32-bit, gcc on 10.6 produces 64-bit objects by default.
| | * Revert "Doc: Updating design files."Morten Engvoldsen2010-04-143-3/+3
| | | | | | | | | | | | This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
| | * Remove statically allocated pixmaps through the post routineJarek Kobus2010-04-141-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid native pixmap object leaking remove statically allocated pixmaps through the post routine. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9815
| * | qdoc: Removed all <table> attributes in favor of using css.Martin Smith2010-04-141-40/+25
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-149-13/+30
| |\
| | * Cocoa: qwidget autotest fails on setToolTipRichard Moe Gustavsen2010-04-143-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason turns out to be that we: 1. Half-way fake mouse events from QCursor::setPos 2. Don't fake mouse move upon mouse enter unless traking is on The test failed when mouse trackin was on, so that we ended up faking the same mouse move event twize (in QCursor::setPos and mouseEnter). We now do a different implementation for setPos on cocoa (so that native events will be generated), and always fake a mouse move event from mouse enter to make tooltips (and other event filters) work Reviewed-by: MortenS
| | * Compile on Mac OS 10.4Kent Hansen2010-04-146-3/+12
| | | | | | | | | | | | Reviewed-by: Morten Sørvig
| * | qdoc: Checked for empty title.Martin Smith2010-04-141-2/+4
| | |
| * | qdoc: Added TOC to class ref pages.Martin Smith2010-04-141-0/+1
| |/ | | | | | | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet.
| * Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-04-1435-560/+1752
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1417-542/+1593
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. Fix QTextDocument::undo() cursor positioning
| | | * Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and ↵Thiago Macieira2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other minor compile errors" The compile fix for SunCC caused a build failure for MinGW with gcc 3.4. However, QtConcurrent is not supported for Sun CC, so revert the fix (let mingw compile and SunCC break). This reverts part of commit a354e98838e67e9bbd9473d4cd42b89f45d0e3fe (MR 547).
| | | * Fix margins for placeholdertext in QLineEditJens Bache-Wiig2010-04-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The margins were lacking the minimum font bearing that normal text gets. This would generally make the margin too small when showing this text. Reviewed-by: ogoffart Task-number: QTBUG-9823
| | | * Merge remote branch 'staging/master' into 4.7Thiago Macieira2010-04-130-0/+0
| | | |\
| | | | * 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.
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1314-527/+1562
| | | |\ \
| | | | * | Doc: Updating design files.Morten Engvoldsen2010-04-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Doc: Fixing design bugs. Updating the index page and script/style files. ↵Morten Engvoldsen2010-04-1314-524/+1559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding some image files. Reveiwed-by: trustme
| | | * | | qdoc: Added TOC to module pages.Martin Smith2010-04-131-15/+19
| | | |/ /
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-44/+77
| | | |\ \
| | | * | | qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Each <ul> is now <ul class="leveli">, where i is 1..n.
| * | | | | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-1431-990/+2246
| | | | | | | | | | | | | | | | | | | | | | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1493-1090/+1616
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * | | | | Revert "Removed double setting of _WIN32_WINNT"Olivier Goffart2010-04-133-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a165d1cfbb15ced6079a0d752fbdb37a478ff46f. Was causing an error: (msvc2005) qthread_win.cpp(369) : error C3861: 'SwitchToThread': identifier not found
| * | | | | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6b2cf497268037a5c127affeef3e6efd055164ec.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1397-1119/+1628
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| | * | | | | removed a few warnings on wince buildsThierry Bastian2010-04-132-5/+5
| | | | | | |
| | * | | | | Removed double setting of _WIN32_WINNTThierry Bastian2010-04-133-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Derived from the comments in merge request #2175
| | * | | | | QTreeView: remove dead code.Olivier Goffart2010-04-132-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not in use since p4 change 221452 Reviewed-by: Gabriel
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-13562-4071/+10574
| | |\ \ \ \ \
| | | * | | | | Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."Olivier Goffart2010-04-1310-149/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d22c8c60ffd986cc46d1f1cab878d60b03b5d4ea. The change is not binary compatible
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-13101-1083/+1760
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits) build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much ...
| | | | * | | | | build fix for S60Thierry Bastian2010-04-131-1/+1
| | | | | | | | |
| | | | * | | | | Improve handling of QAction in soft key managerThierry Bastian2010-04-135-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It also reduces QActionPrivate by 16 bytes.
| | | | * | | | | Remove useless assertThierry Bastian2010-04-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would make qconfig crash.
| | | | * | | | | qdrawhelper: fix optim in 2245641baOlivier Goffart2010-04-131-29/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 2245641baa58125b57faf12496bc472491565498 was not correct as the x2 (and y2) were not correct on the first line (the value was 1 instead of 0) Fixes tst_QImage::smoothScale3 Reviewed-by: Samuel Rødal
| | * | | | | | | doc: Clarify effect of QFont::NoFontMergingEskil Abrahamsen Blomfeldt2010-04-131-3/+5
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been reports of several people who expect QFont::NoFontMerging to turn off all automatic resolution of fonts when displaying text. However, the flag only turns off automatic font resolution within a script item. Suitable fonts for scripts not supported by the current font are still picked automatically. We cannot change the behavior of QFont::NoFontMerging, so the documentation has been made clearer and task QTBUG-9816 has been created to implement a new style strategy flag that supports the use case. Task-number: QTBUG-1732 Reviewed-by: Trond
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1295-1050/+1663
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits) QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much Implement heightForWidth support for QTabWidget and QStackedLayout. Fix the doc for QFrame::frameStyle Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D Add runtime check for GLX >= 1.3 before using glXCreatePixmap ...
| | | * | | | | | QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPageOlivier Goffart2010-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9674 Reviewed-by: jbache
| | | * | | | | | accelerate QWindowsPipeWriter for bigger chunks of dataJoerg Bornemann2010-04-122-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't put pipes into message mode. This makes it possible to not split data into 2k chunks. Reviewed-by: ossi