summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QScriptContextInfo: fix the line numbers with JITOlivier Goffart2009-08-281-3/+11
| | | | It even works better than with the interpreter
* QScriptEngine: Remove one superflous stackframe for native call made by JITOlivier Goffart2009-08-281-1/+7
| | | | | | | JIT does create stackframe while the interperer doesn't. So we would end up with one superflous stackframe Reviewed-by: Kent Hansen
* Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.Gabriel de Dietrich2009-08-285-1/+30
| | | | | | | | | | | | | | The signal index actually emitted was different from the signal index registered. This was due to recent changes in the meta-object protocol, where new indexes are being created (cloned) for signals with default parameters. When registering the transition signal, we now look for the original (non cloned) signal index. The transition keeps track of the user-specified signal index, and sets it when calling onTransition. Reviewed-by: Kent Hansen Reviewed-by: Olivier Goffart Task-number: 260403
* Documentation of QAbstractProxyModel::resetOlivier Goffart2009-08-281-3/+2
| | | | | | Rectification after the last merge request integration Reviewed-by: Thierry
* Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-284-8/+56
| | | | | | | | | | | | | | | | | | | | This commit deprecates the QAIM::reset() method, and adds beginResetModel() and endResetModel() methods, addressing Qt issue 247023. http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023 If models and proxies use QAIM::reset() alone, then proxies will emit modelAboutToBeReset after its source model is reset. This means that mapToSource will not behave as expected (Will always return an invalid index) in a slot connected to modelAboutToBeReset. The usecase for this is maintaining viewstate (which items are selected, expanded) when the model is reset. See BrowserWidget::modelChanged here: http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup Task-number: 247023 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-request: 1072
* QAbstractAnimation: replacing QPointer usage for QWeakPointerLeonardo Sobral Cunha2009-08-281-12/+19
| | | | | | Added guard checks after the virtual method calls. Reviewed-by: thierry
* Fix crash in backingstore when QWidget::paintEngine() returns 0Prasanth Ullattil2009-08-281-2/+2
| | | | Reviewed-by: Samuel
* QNAM HTTP Code: Do not cache Date headerMarkus Goetz2009-08-281-0/+6
| | | | | | | | The caching of this ever-changing header caused disk re-writes even if not necessary because the actual HTTP entity did not change. Task-number: 259961 Rev-By: Peter Hartmann
* QNAM HTTP Code: HTTP/1.0 has implicit connection closeMarkus Goetz2009-08-281-2/+5
| | | | Reviewed-by: TrustMe
* doc: Change some uses of \reimp to \internal.Martin Smith2009-08-281-4/+0
|
* Merge branch 'inputPanelExample' into 4.6axis2009-08-281-8/+9
|\
| * Doc: First review of the input panel example.David Boddie2009-08-281-8/+9
| |
* | Compile with Qt-in-a-namepsace.Morten Sørvig2009-08-284-12/+21
| |
* | Remove unnecessary static_cast in QDirectFBScreenAnders Bakken2009-08-281-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Make lockSurface take a real enumAnders Bakken2009-08-282-3/+3
| | | | | | | | Reviewed-by: TrustMe
* | Define highp to mediump on OpenGL/ES systems that don't have highpRhys Weatherley2009-08-271-0/+15
| | | | | | | | Reviewed-by: Tom Cooksey
* | Remove extraneous semi-colonsRhys Weatherley2009-08-272-3/+3
| | | | | | | | Reviewed-by: trustme
* | Rearrange ifdefsAnders Bakken2009-08-271-3/+1
| | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2733-283/+636
|\ \
| * | QAbstractAnimation: fixes segfault when deleting animation inside ↵Leonardo Sobral Cunha2009-08-272-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateCurrentTime That deletion removed the respective animation from the list of running animations being processed, but not from the copy of the list introduced in 48489988521b818bda8d76e60cb272508e91b490, thus we had a dangling pointer. Reviewed-by: thierry
| * | work around a compiler bug (gcc <= 4.0.x) that renders the drop-in versionhjk2009-08-271-0/+6
| | | | | | | | | | | | | | | | | | of QStringBuilder incompilable Reviewed-by: Roberto Raggi
| * | Merge branch '4.6'Thiago Macieira2009-08-27151-4593/+5774
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| | * \ Merge branch '4.5' into 4.6Thiago Macieira2009-08-273-8/+22
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result tests/auto/linguist/lupdate/testdata/good/lacksqobject/expectedoutput.txt tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp tests/auto/qcombobox/tst_qcombobox.cpp tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp tests/auto/xmlpatternsview/view/MainWindow.cpp tests/auto/xmlpatternsview/view/TestCaseView.cpp tests/auto/xmlpatternsview/view/TestResultView.cpp tests/auto/xmlpatternsview/view/TreeSortFilter.cpp tests/auto/xmlpatternsview/view/UserTestCase.cpp tests/auto/xmlpatternsview/view/XDTItemItem.cpp tests/auto/xmlpatternsview/view/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.h tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h tests/auto/xmlpatternsxqts/lib/Global.h tests/auto/xmlpatternsxqts/lib/ResultThreader.h tests/auto/xmlpatternsxqts/lib/TestBaseLine.h tests/auto/xmlpatternsxqts/lib/TestCase.h tests/auto/xmlpatternsxqts/lib/TestResult.h tests/auto/xmlpatternsxqts/lib/TestResultHandler.h tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h tests/auto/xmlpatternsxqts/lib/Worker.h tests/auto/xmlpatternsxqts/lib/XMLWriter.h tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
| | | * | QSslSocket: Clarified doc about QSslSocket::systemCaCertificatesMarkus Goetz2009-08-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function only returns the certificates bundled with Qt. Reviewed-by: TrustMe
| | | * | QImageReader via JPEG image load plugin fails to load correctly a CMYKKeith Isdale2009-08-271-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoded JPEG CMKY encoded JPEG code missing from scaled image JPEG loading Task-number: 260192 Reviewed-by: Stian Sandvik Thomassen
| | | * | Fix subControlRect of the Mac style for the QComboBoxBenjamin Poulain2009-08-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subControlRect of the arrow and the listBoxPopup where assuming the widget rect is at the origin. Reviewed-by: Richard Moe Gustavsen Reviewed-by: Pierre Rossi
| | * | | Fixed path filling in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bounding box was not updated for moveTo-commands except the first one. Therefore, the calculated bounding box could be too small for paths with more than one subpath, and when the stencil method was used, parts of the path would not be filled. Task-number: 245803 Reviewed-by: Samuel
| | * | | QTabBar: Fix the position of button in tabs.Olivier Goffart2009-08-272-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the PM_TabBarTabHSpace instead of the hardcoded '6' Use a spacing of 4px instead of 2px between the buttons and the text. Reviewed-by: jbache
| | * | | QTabBar: fix text being croped when there is an icon on the tabOlivier Goffart2009-08-272-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making sure the computation in QTabBar::tabSizeHint and QCommonStylePrivate::tabLayout are the same Reviewed-by: jbache
| | * | | Refactor the way QCommonStyle layout the tabOlivier Goffart2009-08-272-81/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge all the code in a common layoutTab function This commit only moves the code around and doesn't change any behavour. The fixes for the broken layouts will go in another commit Reviewed-by: jbache
| | * | | QNAM HTTP Code: Optimize connectionCloseEnabledMarkus Goetz2009-08-274-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was called pretty often, therefore we now calculate this once and save it in a bool. Reviewed-by: TrustMe
| | * | | Doc: Explained how mouse events are handled by QGraphicsView.Geir Vattekar2009-08-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 259924 Reviewed-by: Andreas Aardal Hanssen
| | * | | Gestures: Implement swipe gestureRichard Moe Gustavsen2009-08-277-4/+171
| | | | | | | | | | | | | | | | | | | | Note: if this fails building on any platform, talk to Denis!
| | * | | QNAM HTTP Code: Moved isSocket* functions to channel objectMarkus Goetz2009-08-274-32/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner code. Reviewed-by: TrustMe
| | * | | Fix compile error on WindowsPrasanth Ullattil2009-08-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed QSize to QSizeF Reviewed-by: Trust Me
| * | | | compile x11Gunnar Sletta2009-08-271-1/+1
| | | | |
| * | | | Introduce QGraphicsItem::ItemIsPanel, light-weight window.Andreas Aardal Hanssen2009-08-267-124/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ItemIsPanel allows items that act like windows. They can be activated and deactivated just like windows and focus is handled just like with windows. The main difference is that panels are more light-weight. There's less built-in functionality (e.g., clicking a panel doesn't automatically activate nor raise it). This patch also introduces QGraphicsItem::panel(), QGraphicsItem::isPanel(), and QGraphicsItem::isActive(), as well as QGraphicsScene::activePanel(), QGraphicsScene::setActivePanel(). and QGraphicsScene::isActive(). Regular windows (QGraphicsWidgets with Qt::Window set) are also panels, with added functionality. The ItemIsPanel flag is set automatically for windows. Reviewed-by: brad
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-261052-39431/+95799
| |\ \ \ \
| | * | | | make x11 compile...Gunnar Sletta2009-08-261-3/+3
| | | | | |
| | * | | | New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-269-89/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and y-axis inversion and overall less conversion, making significantly faster for plain usecases Reviewed-by: Trond
| | * | | | Fix another minor copy'n'paste error from QLineControl refactoringAlan Alpert2009-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Had left the cursor flash time as half the QApplication cursor flash time by mistake. The new function sets the whole period and not just the time between toggling cursor visibility. Reviewed-by: Trust Me
| * | | | | Doc: Noted the limitation on using slashes in settings section names.David Boddie2009-08-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254511 Reviewed-by: Trust Me
* | | | | | Doc: Added suggestion about decoding arguments from argv. Tidying up.David Boddie2009-08-271-26/+44
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Task-number: 218125 Reviewed-by: Trust Me
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2717-3665/+3510
|\ \ \ \ \
| * | | | | QPropertyAnimation: small refactor and we got rid of QMetaPropertyThierry Bastian2009-08-272-30/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need QMetaProperty becaus we always try to directly use the qt_metacall. This allowed for a 24 bytes reduction of the private class.
| * | | | | Fixed compilation on AIX.Kim Motoyoshi Kalland2009-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | | | Gestures: make all screen points floatRichard Moe Gustavsen2009-08-273-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in accordance with touch points, and graphics view Rev-By: Discussed with Denis and Brad
| * | | | | Mac: Fix Imageviewer example, and bugfix gesturesRichard Moe Gustavsen2009-08-273-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Rev-By: denis
| * | | | | Cocoa: implement pan gestures to follow mouseRichard Moe Gustavsen2009-08-272-13/+14
| | | | | |
| * | | | | Cocoa: Implement single touch panRichard Moe Gustavsen2009-08-273-56/+79
| | | | | |
generated by cgit v0.12 at 2024-12-30 19:58:04 (GMT)