summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-241-1/+2
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added an install target to runonphone.
| * Added an install target to runonphone.axis2010-08-241-1/+2
| | | | | | | | RevBy: Trust me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2420-39/+66
|\ \ | |/ |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix few declarative code issues discovered by static code analysis Use SpringAnimation in relevant examples again. Fix crach in synchronization of ListModel in WorkerThread. Enable mouse text selection in searchbox example Make QML tests compile on OpenSolaris Document QML_DECLARE_TYPEINFO
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2417-68/+48
| |\
| | * Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-2410-12/+12
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
| | * Use SpringAnimation in relevant examples again.Michael Brasser2010-08-242-5/+5
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-236-16/+20
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-23107-12377/+14813
| |\ \ \
| * | | | Fix crach in synchronization of ListModel in WorkerThread.Martin Jones2010-08-232-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13039 Reviewed-by: Aaron Kennedy
| * | | | Enable mouse text selection in searchbox exampleMartin Jones2010-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add selectByMouse: true Task-number: QTBUG-13024
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2058-427/+1070
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-19123-5919/+2995
| |\ \ \ \ \
| * | | | | | Make QML tests compile on OpenSolarisMartin Jones2010-08-194-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13003
| * | | | | | Document QML_DECLARE_TYPEINFOMartin Jones2010-08-191-0/+10
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-245-51/+31
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix PathView when setting an empty model that is later filled. QDeclarativeVisualItemModel code cleanup.
| * | | | | Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-243-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-232-7/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-232-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible. QWidget metadata has not been set up yet in QWidgetPrivate::init.
| * | | | | 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/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-231-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: update the documentation of NOTIFY signal to reflect reality
| * | | | | Doc: update the documentation of NOTIFY signal to reflect realityOlivier Goffart2010-08-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thorbjorn
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-231-3/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: changing template menus to better reflect links from the index page.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-231-3/+5
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: changing template menus to better reflect links from the index page.
| * | | | | Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-231-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move link for Declarative UI Runtime to Using QML with C++ section
| * | | | | Move link for Declarative UI Runtime to Using QML with C++ sectionBea Lam2010-08-231-1/+1
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2218-17/+62
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Adding pages to the overviews and updating the index page. Doc: Updating pages and linking them to the overviews.
| * | | | Doc: Adding pages to the overviews and updating the index page.Morten Engvoldsen2010-08-223-8/+17
| | | | |
| * | | | Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-2215-9/+45
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-211-5/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: bindTexture: Replace texture if painting is active on pixmap/image
| * | | | 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-202-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2049-12219/+14008
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12807 Reviewed-by: TrustMe
| * | | | | qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add the PDB file name to ForcedIncludeFiles. Task-number: QTBUG-12802 Reviewed-by: TrustMe
| * | | | | Revised fix for pixmap loadingJens Bache-Wiig2010-08-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| | | | | |
| * | | | | Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| | | | | |
| * | | | | Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| | | | | |
| * | | | | Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2029-12196/+13974
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-204-7/+11
| | | | | | |
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-2/+2
| | |\ \ \ \ \
| | | * | | | | Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts, for example Norwegian, which prevents you from typing the @ symbol. Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-2021-12180/+13946
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Update Japanese translationsTakumi ASAKI2010-08-207-8756/+7602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 767 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2025-09-06 06:44:07 (GMT)