summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-2786-206/+2643
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add missing license headers and adjust test data to match.Jason McDonald2009-08-2786-236/+2448
| | | | | | | | Reviewed-by: Trust Me
| * Fix duplicated license headers.Jason McDonald2009-08-278-328/+0
| | | | | | | | Reviewed-by: Trust Me
| * Fix some duplicated license headers.Jason McDonald2009-08-2714-574/+0
| | | | | | | | Reviewed-by: Trust Me
| * 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
| * Adjusting ftp server address for Nokia network.Jesper Thomschütz2009-08-261-1/+1
| |
| * Fix subControlRect of the Mac style for the QComboBoxBenjamin Poulain2009-08-252-3/+60
| | | | | | | | | | | | | | | | 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-278-7/+183
| | | | | | | | Note: if this fails building on any platform, talk to Denis!
* | Demo browser: Less verbose statistics in console outputMarkus Goetz2009-08-271-1/+4
| | | | | | | | Reviewed-by: TrustMe
* | 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
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2721-3924/+3599
|\ \
| * | 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-275-251/+82
| | | | | | | | | | | | Rev-By: denis
| * | Cocoa: implement pan gestures to follow mouseRichard Moe Gustavsen2009-08-272-13/+14
| | |
| * | Cocoa: Implement single touch panRichard Moe Gustavsen2009-08-275-61/+85
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2752-264/+1102
| |\ \
| | * | Make it compile on Windows CE where min and max are predefined macros.Jan-Arve Sæther2009-08-271-11/+11
| | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | * | 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-2780-488/+1621
|\ \ \
| * | | 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-272-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Implement IME reconversion on windows.Prasanth Ullattil2009-08-273-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows IME supports reconversion of text. e.g. On a Japanese layout, up on pressing the HENKAN key a list of choices for the current word are shown in a popup. This patch adds that support to Qt. We will select the current word in the widget and the choices are shown as in the editing mode. Task-number:225588 Reviewed-by: axis
| * | | Merge branch 'mergeRequest' into 4.6axis2009-08-272-74/+59
| |\ \ \
| | * | | move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengineRitt Konstantin2009-08-272-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i'm a garbage collector :) AutoTest: Passed RevBy: Miikka Heikkinen Signed-off-by: axis <qt-info@nokia.com>
| | * | | remove symbianFileName stub once and for allRitt Konstantin2009-08-271-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simply use ifdef to point which implementation should be compiled AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| | * | | fixes and improvements made after s60 branch has been merged into masterRitt Konstantin2009-08-271-51/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crash fixed ( d->filePath.at(0).isLetter() ) * warning removed in QFSFileEngine::copy ( unused param ) * minor optimisations * styling fixes * needless header include removed ( qregexp.h ) AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| * | | | Doc: Widgets may ignore the role set with QWidget::setForegroundRole().Geir Vattekar2009-08-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 182860 Reviewed-by: Trust Me
| * | | | Make sure itemAt() reflects the visual order.Jan-Arve Sæther2009-08-275-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means it should respect the order that was defined with insertItem() and addItem(). Note that this is not strictly necessary (as now explicitly written in the docs for QGraphicsLayout::itemAt()), but commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 broke the order and for people that relied on this that commit caused a regression. In addition, after commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 it was not longer possible to query the "item at visual index". Thus, instead of adding another function (like QGGL::itemAt(int,int)) we make sure that itemAt() also returns the "item at visual index".
| * | | | Doc fixes.Jan-Arve Sæther2009-08-271-9/+30
| | | | |
| * | | | Remove warning.Jan-Arve Sæther2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | It was initialized correctly though, just that some compilers could not see that.
| * | | | Do not crash when double-clicking a tab in a QTabBar with movable tabsFrank Reininghaus2009-08-272-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if QTabBarPrivate's movingTab member is 0 before dereferencing it. This fixes a crash when double-clicking a tab. New unit test included. http://bugs.kde.org/show_bug.cgi?id=202767 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-Request: 1337
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-274-1/+108
| |\ \ \ \
generated by cgit v0.12 at 2025-01-24 23:09:57 (GMT)