summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-315-27/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update to the NTLM code. QTextEngine::LayoutData::reallocate musn't corrupt memory Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| * Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| | | | | | | | | | | | | | | | Fixes extraction of time from the server, and saves the domain information properly. Patch by subcontractor Reviewed-by: Thiago Macieira
| * QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| | | | | | | | | | | | | | | | | | ... on re-allocation failure. So, let's actually check the returned pointer and fail, instead of using Q_CHECK_PTR. Task-number: QT-3785 Reviewed-by: Peter Hartmann Reviewed-by: Samuel Rødal
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-313-6/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| | * doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | The class has been there since 4.6 (http://labs.trolltech.com/blogs/2009/11/23/qtscript-in-46/), but we don't see a reason to hide it any longer. Task-number: QTBUG-13229 Reviewed-by: Olivier Goffart
| | * QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-315-12/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Undefined SSE symbols when crosscompiling Qt on PPC.
| * | Undefined SSE symbols when crosscompiling Qt on PPC.Benjamin Poulain2010-08-315-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt does not build on PowerPC when compiling for both x86 and PPC on Mac. The compiler is invoked only once for both architecture so the defines are there in order to get the optimized path for x86. Those defines needs to be removed from the compilation environment when the target is set to PPC by GCC. Reviewed-by: Kent Hansen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-313-15/+45
|\ \ \ | |/ / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Center and clip QML startup animation so it looks correct in fullscreen Prevent calling deleteLater() from QML Ignore non-scriptable properties in QML
| * | Prevent calling deleteLater() from QMLAaron Kennedy2010-08-311-2/+2
| | | | | | | | | | | | QTBUG-13045
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-316-68/+27
| |\ \ | | |/
| * | Ignore non-scriptable properties in QMLAaron Kennedy2010-08-313-13/+43
| | | | | | | | | | | | QTBUG-13043
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-314-144/+275
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make tst_image a little bit more tollerent to rounding errors Clear the QGLWindowSurface in ::beginPaint when needed. Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work. Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| * | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| | | | | | | | | | | | | | | Merge-request: 2462 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| | | | | | | | | | | | | | | | | | On desktop, we should just do swapBuffers() in swapRegion(). Reviewed-by: Trond
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-312-139/+259
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-302-139/+259
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| | | * | Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text coordinates itself and does not require QStaticText to use device coordinates. Task-number: QTBUG-13228 Reviewed-by: Samuel
| | | * | qdrawhelper: backport the optimisations in fetchTransformBilinear from ↵Olivier Goffart2010-08-301-138/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master to 4.7 This backport the following commits: e55b6a3 qdrawhelper: remove code duplication 0d7e683 qdrawhelper: optimize fetchTransformedBilinear 29ef46e Fix compilation with RVCT 6601458 qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up) 398ef0ca Fix nasty copy-paste bug in fetchTransformedBilinear() d585ece qdrawhelper: fix assert in fetchTransformedBilinear Reviewed-by: Benjamin Poulain
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3123-1199/+1728
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't double call classBegin() Notify QML internal notifiers of item geometry changes before QML signal handlers. Revert "Add 'cached' property to Image." Add 'cached' property to Image. Ensure Flickable visibleArea is updated when view height changes Improve calling QML functions from C++ docs. Add missing license headers Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Simplify type management code QML JavaScript .import parser Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-6/+6
| |\ \ \
| | * | | Notify QML internal notifiers of item geometry changes before QML signal ↵Martin Jones2010-08-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers. Task-number: QTBUG-12303 Reviewed-by: Aaron Kennedy
| * | | | Don't double call classBegin()Aaron Kennedy2010-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | QTBUG-13114
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3125-101/+201
| |\ \ \ \
| | * | | | Revert "Add 'cached' property to Image."Yann Bodson2010-08-317-74/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will have to go in 4.8. This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
| | * | | | Add 'cached' property to Image.Yann Bodson2010-08-317-17/+74
| | |/ / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
| | * | | Ensure Flickable visibleArea is updated when view height changesMartin Jones2010-08-313-0/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13095
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-303-6/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-303-6/+14
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | | | * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3034-426/+17
| | | | |\
| | | | | * QDeclarativeDebug: Destroy incoming connections if already connectedLasse Holmstedt2010-08-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, QML Inspector in Qt Creator gets no error message for failed connections, which can lead to confusion. Reviewed-by: ogoffart
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2731-215/+456
| | | | |\ \
| | | | * | | Fix VisualDataModel model update handling when rootIndex is specified.Martin Jones2010-08-271-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13038
| * | | | | | Simplify type management codeAaron Kennedy2010-08-2717-1186/+1470
| | | | | | |
| * | | | | | QML JavaScript .import parserAaron Kennedy2010-08-272-0/+222
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-306-68/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix #pragma message(), the message must be enclosed in parentheses preserve non-standard source references QSslConfiguration: fix crash when accessing null pointer properly parse ts contexts in obsolete messages move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler Fix static build on Windows with MinGW. Reenable the reporting of CPU features. make qdoc3 boot-strappable again fix MinGW cross compilation with -debug-and-release Updated and new Slovenian translations for Qt 4.7 Designer: Fix crash on unsupported Language/Country combination. Doc: Fixed qdoc warnings and generalized the date and time descriptions. Doc: Whitespace fixes. Doc: Fixed snippets in QML introduction broken in an earlier commit. doc: Fixed numerous qdoc warnings.
| * | | | | QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2010-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265
| * | | | | Fix static build on Windows with MinGW.Mark Brand2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for static code. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | Reenable the reporting of CPU features.Thiago Macieira2010-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The linking error before was most likely namespace issue
| * | | | | Doc: Fixed qdoc warnings and generalized the date and time descriptions.David Boddie2010-08-271-16/+2
| | | | | |
| * | | | | Doc: Whitespace fixes.David Boddie2010-08-271-3/+3
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-272-52/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed numerous qdoc warnings.
| | * | | | doc: Fixed numerous qdoc warnings.Martin Smith2010-08-272-52/+19
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-301-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Text is inputted on top of existing text in anomaly QLineEdit cursor is shown when asked to be non-visible
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-08-2778-673/+540
| |\ \ \ \ \ | | |/ / / /
| * | | | | QLineEdit cursor is shown when asked to be non-visibleSami Merila2010-08-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QLineEdit is sent a QInputMethodEvent::Cursor event with value zero, widget still shows blinking cursor. This is due to that QLineControl ignores its internal state variable m_hideCursor value. As a fix, m_hideCursor is now considered when drawing the cursor. Additionally, the cursor blinking timer is stopped when cursor is hidden. Task-number: QT-3670 Reviewed-by: axis
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-3018-94/+169
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (377 commits) Correct last right bearing in boundingBox(glyphs) Make sure propagated font in QGraphicsWidget can be set on a QPainter Apparently QPen::brush() can't return a NoBrush for a NoPen. Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen. Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush. use QFile:map instead of ::mmap Do not use global static const references to objects Revert "Refactor blend_transformed_bilinear to simplify the blend type checking" Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition. Refactor blend_transformed_bilinear to simplify the blend type checking Note RTL behavior changes in docs and changelog Implement qt_memfill32 with Neon. Implement the composition mode Plus with Neon. Fix the broken unicode detection of ODBC driver. Doc: Fixed qdoc warnings. Doc: updating getting started docs - not finished Make it possible again to build Qt without webkit Doc: fixing creator bugs, removing menus and textbox in the header Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch. Doc: Fixing overlapping text in header list ...
| * | | | | Correct last right bearing in boundingBox(glyphs)Jiang Jiang2010-08-277-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 07880542ecc479807c23c5646d263135240822ff introduced regression to QFontMetrics::boundingRect and QTextEngine::boundingBox on FT, XLFD and QPF font engine. Because on these platforms, rightBearing of the last glyphs is already removed from the width returned in glyph_metrics_t. Subtracting that rightBearing twice will cause the resulting boundingBox smaller than expected. This patch fix this by removing last right bearing accounting code from generic QTextEngine::boundingBox, instead, we put it into font engines that need them: QFontEngineWin, QCoreTextFontEngine, QFontEngineMac, QFontEngineS60 and QFontEngineQWS. So that the resulting width should be correct on all platforms without introducing any performance penalties. Task-number: QTBUG-6854, QTBUG-12950 Reviewed-by: Eskil
generated by cgit v0.12 at 2025-01-18 10:46:06 (GMT)