summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
| | | | | | | | | It is already a singleton, just formalize it so it can be used in other files than qdeclarativeengine.cpp This also remove the global olbject QDeclarativeEngineDebugServer::m_engines Reviewed-by: Lasse Holmstedt
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2410-35/+64
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix mispositioned text with QStaticText and OpenVG graphics system Use binarysort to find items. QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected Fix tst_Collections::QTBUG13079_collectionInsideCollection Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itself Fix assignment of a container included in the container itself
| * Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-08-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | The OpenVG paint engine, like the OpenGL2 paint engine, supports caching the untransformed glyphs and transforming them as they are drawn. Since we would pretransform the positions of the glyphs, the transformation would be applied twice, thus making the glyphs appear in the wrong location when the painter had a transform set. Task-number: QTBUG-13049 Reviewed-by: Gunnar
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-08-24247-1377/+3284
| |\
| | * QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ↵Olivier Goffart2010-08-241-1/+3
| | | | | | | | | | | | | | | | | | and changed() signal connected Reviewed-by: bnilsen
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-246-18/+27
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itself Fix assignment of a container included in the container itself
| | | * Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itselfOlivier Goffart2010-08-231-8/+12
| | | | | | | | | | | | | | | | | | | | Task-number: related to QTBUG-13079 Reviewed-by: Joao
| | | * Fix assignment of a container included in the container itselfOlivier Goffart2010-08-235-10/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13079 Reviewed-by: Joao
| * | | Use binarysort to find items.Gunnar Sletta2010-08-242-14/+29
| | | | | | | | | | | | | | | | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-231 Reviwed-by: Eskil
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2413-62/+15
|\ \ \ \
| * | | | Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-2410-12/+12
| | |/ / | |/| | | | | | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
| * | | Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-241-1/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13017 Reviewed-by: Martin Jones
| * | | QDeclarativeVisualItemModel code cleanup.Michael Brasser2010-08-242-49/+1
| | |/ | |/| | | | | | | | | | | | | | | | Remove unused function. Set abstract item model to 0 after disconnecting, in line with the other model types. Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-233-3/+8
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: QtConcurrent::run. Make sure the example actually compiles
| | * | Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::split has overload, and if you want to take the address of a function with overload, you need to cast it. If we really wanted to use QString::split, we would have to do QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive); So use QByteArray::split as an example instead Task-number: QTBUG-12897 Reviewed-by: David Boddie
| * | | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise application crashes because rendering to invisible window surface will panic eventually. Reviewed-by: Trond
| * | | QWidget metadata has not been set up yet in QWidgetPrivate::init.Jani Hautakangas2010-08-231-2/+2
| |/ / | | | | | | | | | | | | | | | | | | q->inherits("QGLWidget") gives incorrect result, so use QWidgetPrivate::isGLWidget variable instead. Reviewed-by: Jason Barron
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2327-113/+584
|\ \ \ | |/ /
| * | bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
| | | | | | | | | | | | | | | | | | | | | This fixes an issue with WebKit canvases not updating after the first frame since there's always a QPainter open on their backing store. Reviewed-by: Samuel Rødal
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-201-4/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QDeclarativeDebug: stream all the context, including the internals ones.
| | * | QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-201-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some public context are within the internal context, so we need to stream them to get every objects Reviewed-by: Lasse Holmstedt
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-203-9/+23
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS Revised fix for pixmap loading Assistant: Clean-up - fix spelling mistakes. Assistant: Clean-up: Use const references in foreach loops. Assistant: Clean-up: Mark constructors as explicit. Assistant: Clean-up - add newlines to end of files. Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| | * | Revised fix for pixmap loadingJens Bache-Wiig2010-08-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 2c8f9dee611 had an unwelcome side-effect and was reverted. Since we do have the undocumented behavior that we scan for all possible extensions when QPixmap is provided with a filename without extensions we could not simply exit if the file did not exist. We now check if there are extensions before doing so. Reviewed-by: gabi Task-number: QTBUG-11137
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-202-9/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| | | * | QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filterRichard Moe Gustavsen2010-08-201-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using namefilters in the non-native file dialog is a bit broken by design, since it don't store the whole selected name filter, but only the filter with details stripped off (if this is specified). And it stores this data in gui widgets. And the native file dialog also suffers from this. At least this patch will pick the first matching name filter (with details) given a details-stripped version. Task-number: QTBUG-12870 Reviewed-by: cduclos
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-209-68/+104
| | | |\ \
| | | * | | just build connman and networkmanager plugins on linuxLorn Potter2010-08-201-1/+1
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-209-70/+73
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connected. Reviewed-by: bnilsen
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-208-69/+70
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-208-69/+70
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-198-69/+70
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * | | 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
| | | | | * | | moc: Error if the NOTIFY signal is invalid.Olivier Goffart2010-08-193-48/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2013-24/+467
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2013-24/+467
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
| * | | | | | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
* | | | | | | Fix crach in synchronization of ListModel in WorkerThread.Martin Jones2010-08-232-2/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13039 Reviewed-by: Aaron Kennedy
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-201-39/+68
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * '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
| * | | | | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-201-39/+68
| |/ / / /
* | | | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-191-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-191-3/+0
| | | | | | | | | | | | | | | 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
| | |
generated by cgit v0.12 at 2025-01-03 23:10:42 (GMT)