summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-296-32/+62
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Update in reaction to GradientStops changing.Martin Jones2009-05-292-2/+29
| |
| * Update on gradient change.Martin Jones2009-05-291-0/+3
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-295-103/+107
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-2828-1002/+411
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Remove extra semicolons.Martin Jones2009-05-284-28/+28
| | | |
| * | | Fix memory leak.Martin Jones2009-05-271-2/+2
| | | |
* | | | Make compile under Open GL ES 2.Michael Brasser2009-05-297-22/+23
| | | | | | | | | | | | | | | | We will need to optimize the pixmap.toImage calls.
* | | | Merge branch 'kinetic-declarativeui-pixmapopt' of ↵Michael Brasser2009-05-2922-268/+180
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Switch from QImage to QPixmap, to allow OpenVG optimization.Warwick Allison2009-05-2522-268/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch QFxPixmap to use QPixmapCache, not own partial QImage cache. OpenGL prefers QImage for optimization, but that optimization is only partially preserved (QFxPixmap deals ONLY with QPixmap now). Opaque QFxPixmap no longer available.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-29221-3335/+1818
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/doc.cpp
| * | | | | Fixed compile of Qt/Embedded.Rohan McGovern2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix what looks like the result of a `git merge' gone wrong.
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMichael Brasser2009-05-281-1/+1
| |\ \ \ \ \
| | * | | | | Fixed WinCE compile, perhaps.Rohan McGovern2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix obvious typo: frosmUtf16 -> fromUtf16
| * | | | | | Export symbol needed by the declarative module.Michael Brasser2009-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Leo
| * | | | | | Further optimized fast scaling of ARGB8565 images onto RGB16 images.Michael Brasser2009-05-282-5/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves performance on embedded. Reviewed-by: Samuel
| * | | | | Fixed bug in GL graphics system when painting to pixmaps.Samuel Rødal2009-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the correct texture unit is active when copying from the pixmap to the FBO in begin().
| * | | | | QStringBuilder benchmark: make testing of the drop-in replacement ↵hjk2009-05-282-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator+() easier. This adds a few explicit QString(...) casts around operator+() based expressions to make them acceptable for QCOMPARE.
| * | | | | Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-282-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brad Hards (2): Remove duplicate qpdf_p.h include. Fix build when compiling Qt using -no-opengl configuration. Request-url: http://gitorious.org/qt/qt/merge_requests/548 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | * | | | | Fix build when compiling Qt using -no-opengl configuration.Brad Hards2009-05-281-3/+6
| | | | | | |
| | * | | | | Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
| | | | | | |
| * | | | | | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
| | | | | | |
| * | | | | | Polished aboutQt dialog a little bit.Denis Dzyubenko2009-05-281-5/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitted text in the AboutQt dialog into several chunks to make use of advanced qmessagebox text fields Reviewed-By: Trenton Schulz
| * | | | | small cleanup on the sub-attaq demoThierry Bastian2009-05-286-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | removed declaration of properties that are already declared in Qt
| * | | | | Removed dead code ifdefed with QDOC2DOXMartin Smith2009-05-285-2240/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were added to qdoc in the days when we thought we might switch to doxygen. Now we have taken the approach of making qdoc output be more doxygen-like, so this ifdefed code is now dead.
| * | | | | Merge branch '4.5'Tom Cooksey2009-05-287-28/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| | * | | | | Don't assume the tty was in K_XLATE when application startedTom Cooksey2009-05-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, query the mode at startup, store it and restore it on exit. Reviewed-By: TrustMe Task-number: 254194
| | * | | | | BT: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-281-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a form is loaded, Designer will set the path to the resource as an absolute path rather than the path actually stored in the file. There is code to work around this to make file paths relative when saving the file later on, but no work around for Qt Jambi. So when saving Qt Jambi forms, you would get an absolute path to the resource which contains the location of the resource file (.jar or on disk) This of course breaks the concept of resources, as the .jui file was no longer portable. The fix is to special case Qt Jambi resources and set the relative path when loading them. The patch has no effect on regular Designer. Task-number: 254621 Reviewed-by: Kai Koehne
| | * | | | | support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
| | * | | | | BT: aboutQt dialog is too big.Denis Dzyubenko2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of setInformativeText in qmessagebox for aboutQt dialog for now. Proper fix might be to add scrollable widget to the dialog, or split the about info into several pieces, though it cannot be done in a patch release. Task-number: 254464 Reviewed-by: Trenton Schulz
| | * | | | | Doc - final screenshot and changesKavindra Devi Palaraja2009-05-282-11/+8
| | | | | | |
| * | | | | | Fixed incorrect handling of composition modes in GL2 paint engine.Samuel Rødal2009-05-282-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the source pixels are opaque we have to enable blending for the non-trivial composition modes. Some of the composition modes are independent of source alpha and depend on destination alpha for example. Reviewed-by: Tom
| * | | | | | Forgot to close the TTY handle.Robert Griebl2009-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | Introduce a new class QStringBuilder to speed up the creation ofhjk2009-05-287-3/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString objects from smaller chunks. The QStringBuilder class: QStringBuilder uses expression templates (using the '%' operator) to postpone any actual concatenation until it is assigned to an actual QString. At that time it knows the exact sizes of all chunks, can compute the required space, allocates once a QString of appriopriate size and then copies over the chunk data one-by-one. In addition, QLatin1Literal is a drop-in replacement for QLatin1String (which we can't change for compatibility reasons) that knows its size, therefore saving a few cycles when computing the size of the resulting string. Some further saved cycles stem from inlining and reduced reference counting logic (the QString created from a QStringBuilder has typically ref count equal to 1, while QString::append() needs an extra test) Minor changes to the existing QString class: - Introduce QString constructor to create an uninitialized QString of a given size. This particular constructor is used by QStringBuilder class. - Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing overloads of operator+() and helps finding the places where they are used in code. - Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing overloads of operator+() and creates a new templated operator+() with identical implementation of operator%(). This allows code that is compilable QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only case that is not covered is creating objects like QUrl that are implicitly constructible from a QString from a QStringBuilder result. This needs to be converted explicitly to a QString first, e.g. by using QUrl url(QString(QLatin1String("http://") + hostName)); Reviewed-by: MariusSO
| * | | | | | Compile fix with namespaces.hjk2009-05-2810-8/+31
| | | | | | |
| * | | | | | Make WA_TranslucentBackground work for QGLWidgets on X11/EGLTom Cooksey2009-05-281-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | Send ParentChanged event to QGLWidgets when the wId changes on EGLTom Cooksey2009-05-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL has window surfaces which are bound to a particular window ID. When that window ID changes, the EGL surface must be re-created. This is achieved by sending the QGLWidget a ParentChanged event. Reviewed-By: Trond
| * | | | | | Print the error string when surface creation failsTom Cooksey2009-05-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | Fix build on X11/OpenGL ES 2.0Tom Cooksey2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | Do not deduce scrollbar extent twice if scrollbar policy is ↵Aurélien Gâteau2009-05-281-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt::ScrollBarAlwaysOn Request-url: http://qt.gitorious.org/qt/qt/merge_requests/432 Reviewed-by: Olivier Goffart Reviewed-by: Thierry
| * | | | | | QStateMachine: better way to get the sender signalIndexOlivier Goffart2009-05-281-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QObject internals have changed, and the mutex that need to be locked to access the senders list is not the same anymore, and not accessible form qstatemachine.cpp But we do not need to loop over the senders list anyway because this is done in sender() We also do not need to lock in order to access the currentSender Reviewed-by: Eskil
| * | | | | | Moved QGL2PaintEngineExPrivate into GL2 paint engine header file.Samuel Rødal2009-05-284-93/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Tom
| * | | | | | Respect PM_ScrollView_ScrollBarSpacing in QAbstractScrollArea::minimumSizeHint()Christoph Feck2009-05-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Request-url: http://qt.gitorious.org/qt/qt/merge_requests/382
| * | | | | | improved string operations all over the placeThierry Bastian2009-05-28163-846/+827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | | | | | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-285-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
| * | | | | | Compile qstatemachine autotestOlivier Goffart2009-05-281-1/+1
| | | | | | |
| * | | | | | Doc change; QGraphicsView::DontClipPainter is obsolete since Qt 4.5.Andreas Aardal Hanssen2009-05-282-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lars
| * | | | | | Adds support for linking against iodbc on linux.Bill King2009-05-285-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-2826-1069/+482
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Delay the compilation of bindings until the endAaron Kennedy2009-05-285-103/+107
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This way we have a better understanding of the complete context in which the binding will be executed.
generated by cgit v0.12 at 2024-10-25 07:31:17 (GMT)