summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Integrate merge-request #447 into branch 'master'Oswald Buddenhagen2009-05-191-1746/+1812
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | KOBAYASHI Tomoyuki (1): Update japanese translation file "translations/qt_ja_JP.ts". Repository: git://gitorious.org/~maron/qt/marons-clone.git Branch: master (6a94214e691966874faaab0bacd5d787850e0546) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/447 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD
| * Update japanese translation file "translations/qt_ja_JP.ts".KOBAYASHI Tomoyuki2009-05-191-1746/+1812
| | | | | | | | QtXmlPatterns is not completed.
* | Use QtNetworkSettings, don't hard code IMAP host name. This should fix ↵Frans Englich2009-05-191-2/+2
| | | | | | | | failures in Berlin.
* | compile fixes with namespaceshjk2009-05-192-0/+6
| |
* | Modernize the output of qdoc a bit.Thomas Zander2009-05-191-2/+62
| | | | | | | | | | | | Now we have explicit columns we cann make our docs look a bit better using some simple css additions. This adds light backgrounds in targetted places to make the text more readable.
* | Fixed typo.jasplin2009-05-191-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Fixed incorrect pass/fail semantics for xpass/xfail when usingRohan McGovern2009-05-193-7/+56
| | | | | | | | | | | | | | | | | | | | xunitxml testlib logger. In the testlib plain logger, xfail is considered a pass and xpass considered a fail. xunitxml had the opposite behavior; change it to be the same. Autotest: included
* | Integrate merge-request #381 into branch 'master'Samuel Rødal2009-05-181-19/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zack Rusin (1): Optimize rendering in the GL engine Repository: git://gitorious.org/~zack/qt/zacks-clone.git Branch: graphics (17e1bca1ce366395f8331e16aa96b7176ca1abac) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/381 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| * | Optimize rendering in the GL engineZack Rusin2009-05-111-19/+3
| | | | | | | | | | | | | | | By using REPLACE we don't have to clean the stencil on every draw, effectively optimizing the rendering by 200%.
* | | Merged branch 'master' of git://gitorious.org/~dfaure/qt/dfaures-clone.gitSimon Hausmann2009-05-182-9/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | David Faure (1): Fix compilation with strict iterators Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/437 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | | Fix compilation with strict iteratorsDavid Faure2009-05-182-9/+10
| | | |
* | | | Add src/corelib/kernel/qpointer.cpp to src/corelib/kernel/kernel.priBradley T. Hughes2009-05-181-1/+2
| | | | | | | | | | | | | | | | Makes it possible to find it when using QtCreator :)
* | | | Merged branch 'master' of git://gitorious.org/~icwiener/qt/icwieners-clone.gitTor Arne Vestbø2009-05-1824-29/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frederik Schwarzer (1): typos in docs: double "the" Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/362 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| * | | | typos in docs: double "the"Frederik Schwarzer2009-05-1124-29/+29
| | |/ / | |/| |
* | | | Fix compilation after mergeOlivier Goffart2009-05-181-0/+1
| | | |
* | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-1838-379/+661
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * | | | Adding change details in to Qt 3 to Qt 4 porting guideMorten Engvoldsen2009-05-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding details about QCloseEvents being acceptet by default in Qt 4 opposed to Qt 3 Task-number: 192607 Rev-by: msorvig
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-188-36/+175
| |\ \ \ \
| | * | | | QCss: font-family handle fallback font specsOlivier Goffart2009-05-183-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if one specify more than one parameter in font-family, e.g., font-family: Verdana, Arial Qt should fallback on the second font if the first cannot be found. QFont::setFamily handle the case when the family name contains a comas, so we do not need to handle that specially in the css parser code. Task-number: 252311 Reviewed-by: Thomas Zander
| | * | | | Fix race condition in ~QObjectOlivier Goffart2009-05-183-20/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while using QOrderedMutexLocker::relock we might unlock our mutex protecting the 'senders' list for a short moment. Another thread may then modify or remove element on the list. Therefore, we need to recheck the consistency of the list once we did that. Also, we cannot call removeSender because that will remove every connections, making impossible for another object destroyed in the same time to clean up the senders list, so call derefSender instead. Reviewed-by: Brad
| | * | | | QCalendarWidget::setDateTextFormat() reset the format is the date is invalidBenjamin Poulain2009-05-182-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation, QCalendarWidget::setDateTextFormat() should reset the format if the date is not valid. New tests included for the formating of this widget. Task-number: 252943 Reviewed-by: Olivier
| * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-183-3/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed crash in QWizard running on old Windows systems.jasplin2009-05-183-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the QWizard on a Windows system where QT_NO_STYLE_WINDOWSVISTA is not set and running the app on an old system that has no Vista support, the app would crash in the paint event of the Vista Back button. In this scenario, the Vista Back button is not needed (i.e. the regular Back button next to the Next button is used), so the fix is simply to avoid instanciating it altogether. Reviewed-by: janarve Task-number: 252662
| * | | | | Fix incorrect signal referred to in the docsAndy Shaw2009-05-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the documentation to state sortIndicatorChanged() should be used and not sectionClicked() for connecting to the sortByColumn() slot as the sortByColumn() takes two parameters, not one. Reviewed-by: Kavindra Palaraja
| * | | | Fixed the SVG parser to handle CSS properties with multiple values.Trond Kjernåsen2009-05-181-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS properties with more than 1 value was ignored. E.g. the 'stroke-dasharray' attribute is specified by a comma separates list of numbers. This was previously ignored because the CSS parser split it into a value array. Task-number: 253614 Reviewed-by: Kim
| * | | | Wrote Designer/uic changelog for 4.5.2.Friedemann Kleint2009-05-181-2/+13
| | | | |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Friedemann Kleint2009-05-181-7/+33
| |\ \ \ \
| | * | | | Fix QSoundServer on Big-Endian machines.Tom Cooksey2009-05-181-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 253619 Reviewed-by: Paul
| * | | | | Fixed a bug caused by forms with a sizepolicy of 'Fixed' on the main container.Friedemann Kleint2009-05-182-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore 4.4 behaviour by using a QStackedLayout as the layout containing the actual form (as was in 4.4). The difference in behaviour was caused by insertion of an additional widget with a QVBoxLayout which is supposed to ease setting of inheritable properties (style, etc). Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253236
| * | | | | Made it possible to set string properties using ↵Friedemann Kleint2009-05-181-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesignerFormWindowCursor::setProperty. Ensure the text does not get clobbered by the subproperty handling. Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253278
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Friedemann Kleint2009-05-181-3/+5
| |\ \ \ \
| | * | | | Fixed a bug which implicitly closed perspective transformed poly lines.Trond Kjernåsen2009-05-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the end point of a line in a path is clipped, only closed paths should have the closing line. Task-number: 253663 Reviewed-by: Samuel
| * | | | | Updated German translations for 4.5.2Friedemann Kleint2009-05-1810-299/+300
| |/ / / /
| * | | | Adapted uic test-baseline to the icon generation change 251248)Friedemann Kleint2009-05-151-6/+6
| | | | | | | | | | | | | | | | | | | | Task-number: 251248
| * | | | Initialize variable to avoid valgrind error.Frans Englich2009-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason it's only sometimes hit and cannot be deterministically reproduced. Task-number: 253722 Reviewed-by: TrustMe
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-15253-13774/+2753
| |\ \ \ \
| | * | | | Cocoa: Window flickers when resized with a QTabWidgetRichard Moe Gustavsen2009-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like we were not using the correct functions for setting the max/min size on a cocoa window. The version we used before included the unified toolbar, which is wrong. The new one does not. Task-number: 252642 Reviewed-by: Trenton Schulz
| | * | | | HTTP authentication: return error if authentication cannot be handledPeter Hartmann2009-05-152-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return error upon receiving an unknown authentication method (e.g. WSSE); before we were just silently returning. Reviewed-by: Thiago Macieira
| | * | | | Cleaning bug in custom layout example.Morten Engvoldsen2009-05-152-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one. Task-number: 220656 Rev-by: janarve
| | * | | | Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lincoln Ramsay
| * | | | | Doc: Updated description of QMainWindow::unifiedTitleAndToolBarOnMacGeir Vattekar2009-05-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to include info on Cocoa. Task-number: 252658 Reviewed-by: Trenton Schulz
* | | | | | Fix compilation of the cssparser testOlivier Goffart2009-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Q_GUI_EXPORT macro have been removed, but we still need to export the classes for the test
* | | | | | Make QVectorTypedData inheriting from QVectorDataOlivier Goffart2009-05-181-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the content of QVectorData is not duplicated in the code. Reviewed-by: Thiago Reviewed-by: Brad
* | | | | | Fix warning on QVector with gcc4.4Olivier Goffart2009-05-181-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QVectorData whenever possible instead of QVectorTypedData. It is not safe to convert the shared_null to QVectorTypedData as different instance of qvector with different type may cast it in the same function (because everything is inline) and that would break strict aliasing. Reviewed-by: Thiago Reviewed-by: Brad
* | | | | | Fixed: No margin between the text and the shortcut in menu with stylesheetOlivier Goffart2009-05-181-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If padding, margin border are set on an menu item with stylesheet, no space appeared between the text and the shortcut. Fix that by adding the 12px space, same as in QCommonStyle equivalent function Note that this patch also remove unused code, since the variable with and height were not used. example to reproduce the bug: the following stylesheet on a mainwindow that contains a menu with one action with a shortcut QMenu::item { border: 1px solid red; } Task-number: 252610 Reveiwed-by: jbache
* | | | | | Fixed regression introduced by fix for Task 177022.jasplin2009-05-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for Task 177022 broke the fix for Task 163334. This commit fixes the regression. Reviewed-by: janarve
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMartin Smith2009-05-1814-284/+1139
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add an extension to QPixmapCache to get rid of strings.Alexis Menard2009-05-1812-91/+935
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a new API to add/find/remove pixmaps into QPixmapCache. This new extension is based on a key that the cache give you during the insertion. This key is internally a int which makes all operations in the cache much more faster that the string approach. Auto-tests has been extended as well and a benchmark has been added to compare both approach. I also depecrate the find method for the string API to have a method pointer based and not reference based like the Qt policy says. Reviewed-by: bnilsen Reviewed-by: andreas Followed-deeply-by: trond
| * | | | | less inefficientOswald Buddenhagen2009-05-181-1/+1
| | | | | |
| * | | | | Update japanese translation of Qt Assistant.axasia2009-05-181-192/+203
| | |_|_|/ | |/| | |
generated by cgit v0.12 at 2025-01-05 21:53:04 (GMT)