summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2726-222/+282
| |\ \ \ \
| | * | | | QPropertyAnimation: use of QWeakPointer instead of QObject::connectThierry Bastian2009-08-273-33/+23
| | | | | |
| | * | | | Animation: reordering of private members saves 8 bytesThierry Bastian2009-08-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on the private object Reviewed-by: Trust Me
| | * | | | Doc: Small change to QProcess::waitForFinished()Geir Vattekar2009-08-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 258404 Reviewed-by: Trust Me
| | * | | | fix compiler warnings on WindowsKent Hansen2009-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | "*/ outside of comment"
| * | | | | Fix y orientation of pixmap brushes and pixmaptiles in gl1 engineGunnar Sletta2009-08-274-3525/+3370
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | | Don't flip texture coords in texture brushes in accordance with new bindTextureGunnar Sletta2009-08-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
* | | | | | Doc: Fixed recommended code as suggested in the public task.David Boddie2009-08-271-1/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Task-number: 155124 Reviewed-by: Trust Me
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2743-418/+751
|\ \ \ \ \
| * | | | | disable a few compiler warnings for qtscript/JavaScriptCore on WindowsKent Hansen2009-08-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do it when compiling JavaScriptCore as part of QtWebKit, so do it when compiling it as part of QtScript as well, otherwise the excess warning output is just ridiculous. Adopted from patch at https://bugs.webkit.org/show_bug.cgi?id=27709
| * | | | | fix whacky behavior of QScriptValue::toString() for QVariantKent Hansen2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some types, an empty string is the correct and complete conversion of the type. If the result is an empty string, use QVariant::canConvert() to determine if that is indeed correct, before falling back to the "string-conversion-not-available" path.
| * | | | | QNAM HTTP Code: Reduce connection count for SymbianMarkus Goetz2009-08-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mobile devices with high latency network it does not make sense to have 6 HTTP connections per host:port. Reduced it to 3.
| * | | | | Fixed clipping bugs in QGLWidgets (very noticeable in sub-attaq).Samuel Rødal2009-08-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the paint engine used by QGLWidgets was the GL 2 paint engine the backing store assumed partial update support, which is not the case. We need to check for both QPaintEngine::OpenGL and QPaintEngine::OpenGL2. Reviewed-by: Trond
generated by cgit v0.12 at 2025-01-29 17:35:16 (GMT)