summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-202-0/+15
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add a menu option to open remote files in the QML viewer
| * Add a menu option to open remote files in the QML viewerAlan Alpert2010-08-202-0/+15
| | | | | | | | Task-number: QTBUG-11019
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2020-104/+202
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsView: fix few artefacts that can appear if the changed() signal is connected. tst_qmetaobject: fix compilation, now that wrong NOTIFY property fails Fixed autotest compilation issue on solaris Fixed build issue on Solaris Remove wrong NOTIFY attribute. Ignore LayoutDirectionChange event in QTextControl Fix an obvious bug in tst_QGL::clipTest() moc: Error if the NOTIFY signal is invalid. QDateEdit/QTimeEdit: remove duplicate properties.
| * | QGraphicsView: fix few artefacts that can appear if the changed() signal is ↵Olivier Goffart2010-08-202-11/+33
| | | | | | | | | | | | | | | | | | connected. Reviewed-by: bnilsen
| * | tst_qmetaobject: fix compilation, now that wrong NOTIFY property failsOlivier Goffart2010-08-201-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2017-92/+168
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest compilation issue on solaris Fixed build issue on Solaris Remove wrong NOTIFY attribute. Ignore LayoutDirectionChange event in QTextControl Fix an obvious bug in tst_QGL::clipTest() moc: Error if the NOTIFY signal is invalid. QDateEdit/QTimeEdit: remove duplicate properties.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2017-92/+168
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest compilation issue on solaris Fixed build issue on Solaris Remove wrong NOTIFY attribute. Ignore LayoutDirectionChange event in QTextControl Fix an obvious bug in tst_QGL::clipTest() moc: Error if the NOTIFY signal is invalid. QDateEdit/QTimeEdit: remove duplicate properties.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1917-92/+168
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest compilation issue on solaris Fixed build issue on Solaris Remove wrong NOTIFY attribute. Ignore LayoutDirectionChange event in QTextControl Fix an obvious bug in tst_QGL::clipTest() moc: Error if the NOTIFY signal is invalid. QDateEdit/QTimeEdit: remove duplicate properties.
| | | | * | Fixed autotest compilation issue on solarisThierry Bastian2010-08-195-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12991
| | | | * | Fixed build issue on SolarisThierry Bastian2010-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12994
| | | | * | Remove wrong NOTIFY attribute.Olivier Goffart2010-08-193-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They where related to not unreachable signals. It would cause the compilation to break
| | | | * | Ignore LayoutDirectionChange event in QTextControlJiang Jiang2010-08-191-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutDirectionChange should no longer affect text direction in 4.7, by ignoring this event in QTextControl, we make the behavior consistent with QLineEdit. Reviewed-by: Lars Knoll
| | | | * | Fix an obvious bug in tst_QGL::clipTest()Trond Kjernåsen2010-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | | | * | moc: Error if the NOTIFY signal is invalid.Olivier Goffart2010-08-195-48/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an invalid NOTIFY signal would be silently ignored. Now it throws an error Reviewed-by: Joao Task-number: QTBUG-7684
| | | | * | QDateEdit/QTimeEdit: remove duplicate properties.Olivier Goffart2010-08-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were hidding QDateTimeEdit properties. (And their NOTIFY signal did not work correctly) Reviewed-by: Joao
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-2016-25/+495
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Introduce QtOpenGL module for Symbian.
| * | | | | | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-2016-25/+495
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2013-195/+285
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow QML Quit buttons to work inside QtDemo. Fix minehunt demo for Symbian Add a quit button to declarative examples in QtDemo Without Declarative, still build and run QtDemo
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-207-146/+216
| |\ \ \ \
| | * | | | Fix minehunt demo for SymbianJoona Petrell2010-08-207-146/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
| * | | | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-204-3/+11
| |/ / / / | | | | | | | | | | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-201-13/+13
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-207-45/+353
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doing "import foo.qml" doesn't work in QML anymore Add info to Loader docs about receiving signals and key events
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-191-13/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure geometry of top-level widget accounts for S60 screen furniture
| * | | | Ensure geometry of top-level widget accounts for S60 screen furnitureGareth Stockwell2010-08-191-13/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the S60 screen furniture has already been constructed before QWidgetPrivate::show_sys() is called on a top-level widget which has Qt::WindowMaximized set (e.g. due to a showMaximized() call), its geometry is set to the full screen extent, including the regions covered by the status bar and CBA. This patch ensures that calculation of the widget geometry always takes into account the screen furniture. Task-number: QTBUG-12605 Reviewed-by: Jason Barron
| | | * Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-2045-222/+783
| | | |\ | | | |/ | | |/|
| | * | Doing "import foo.qml" doesn't work in QML anymoreBea Lam2010-08-201-6/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-13042
| | * | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-206-39/+349
| |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-194-8/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fatal crash on solaris 64 bit qdoc: Added more elements to qt.pageindex doc: Removed comment about automatic inclusion of 3rd party library. qdoc3: Added more pagewords & elements to the search index. qdoc3: Added more pagewords & elements to the search index.
| * | Fatal crash on solaris 64 bitCarlos Manuel Duclos Vergara2010-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We use a dummy variable for a function call, and that variable is causing a data misalignment. Changing the type to long fixes the issue. According to Denis it is ok to change this for all cases. Task-number: QTBUG-12928 Reviewed-by: Denis Dzyubenko
| * | qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | | | | | | | | | Task-nr: QTBUG-11113
| * | doc: Removed comment about automatic inclusion of 3rd party library.Martin Smith2010-08-191-4/+2
| | | | | | | | | | | | It must be copied into the appliv=cation bundle automatically.
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-199-12/+4
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-191-0/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc3: Added more pagewords & elements to the search index.
| * | | | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-192-3/+4
| | |/ / | |/| | | | | | | | | | Task-nr: QTBUG-11113
| * | | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | | | | | | | | | | | | | Task-nr: QTBUG-11113
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-198-28/+131
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes a regression preventing loading images without extensions Made GL pixmap backend respect Qt::NoOpaqueDetection flag.. QTextCodec: fix wodring of a comment QDeclarativeImageProvider: Do not keep the global declarative mutex locked when processing.
| * | | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-192-8/+13
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12560 Reviewed-by: gabi
| * | | Made GL pixmap backend respect Qt::NoOpaqueDetection flag..Samuel Rødal2010-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to do the opaque image scan when the Qt::NoOpaqueDetection flag is set. Reviewed-by: Trond
| * | | QTextCodec: fix wodring of a commentOlivier Goffart2010-08-191-2/+4
| | | |
| * | | QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-194-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-199-12/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix Image element svg autotest
| * | | Fix Image element svg autotestJoona Petrell2010-08-199-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, reduced some platform-specific test as the test case is not meant to test regression in the painting routines, but that Image's svg support works. Task-number: Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-192-25/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: cleanup and remove __FUNCTION__, which breaks build on solaris
| * | cleanup and remove __FUNCTION__, which breaks build on solarisLorn Potter2010-08-192-25/+2
| | | | | | | | | | | | Task-number: QTBUG-12904
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1915-104/+250
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added license headers to new files. use intel linker and librarian with icc create missing output directories for substituted files fix shadow builds with scratchbox QMake/Win32/MinGW: Fix ar script generating with absolute paths Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac Crash in QX11PaintEngine::drawPixmap Revert "Fix the rendering of lines with the X11 paint engine" Revert "Outline / fill inconsistency in X11 paint engine."
| * | Added license headers to new files.Rohan McGovern2010-08-183-0/+123
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1815-104/+127
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: use intel linker and librarian with icc create missing output directories for substituted files fix shadow builds with scratchbox QMake/Win32/MinGW: Fix ar script generating with absolute paths Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac Crash in QX11PaintEngine::drawPixmap Revert "Fix the rendering of lines with the X11 paint engine" Revert "Outline / fill inconsistency in X11 paint engine."
| * | use intel linker and librarian with iccOswald Buddenhagen2010-08-181-2/+2
| | | | | | | | | | | | | | | Reviewed-by: thiago Task-number: QTBUG-12937
generated by cgit v0.12 at 2025-01-29 09:21:22 (GMT)