summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Designer: Fix crash on unsupported Language/Country combination.Friedemann Kleint2010-08-301-6/+14
| | | | | | | | ...in the property editor (QLocale). Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Task-number: QTBUG-13267 Task-number: QTCREATORBUG-2212
* Doc: Fixed qdoc warnings and generalized the date and time descriptions.David Boddie2010-08-271-16/+2
|
* Doc: Whitespace fixes.David Boddie2010-08-272-26/+26
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-2799-698/+481
|\
| * 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-271-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Updated some URLs and required tools versions for Symbian
| | * | Updated some URLs and required tools versions for SymbianMiikka Heikkinen2010-08-271-5/+5
| | |/ | | | | | | | | | Reviewed-by: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2737-534/+139
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup Remove pointless \internal docs (that contain no information) Remove pointless \internal docs (that contain no information) Internal QML API cleanup
| | * CleanupAaron Kennedy2010-08-273-13/+11
| | |
| | * Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-272-38/+0
| | |
| | * Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-2728-375/+4
| | |
| | * Internal QML API cleanupAaron Kennedy2010-08-275-108/+124
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2745-63/+213
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update example screenshot in doc. Handle layoutChanged() properly in QML views. Fix ListView and GridView tests following off-by-one fixes. Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac Fix off-by-one at end when views scroll to keep currentItem visible. Make declarative examples a bit more qt-like. Add quit buttons to declarative demos ListView.view and GridView.view properties should not be writable. Avoid Flickable view jumping when drag threashold is exceeded. Fix ListView.view attached property with VisualItemModel Remove dead code. Add test for VisualItemModel layoutChanged() handling Remove unused code. Handle QAbstractItemModel layoutChanged() signal
| | * Update example screenshot in doc.Yann Bodson2010-08-271-0/+0
| | |
| | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2010-08-2614-29/+85
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2644-63/+213
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Handle layoutChanged() properly in QML views. Fix ListView and GridView tests following off-by-one fixes. Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac Fix off-by-one at end when views scroll to keep currentItem visible. Make declarative examples a bit more qt-like. Add quit buttons to declarative demos ListView.view and GridView.view properties should not be writable. Avoid Flickable view jumping when drag threashold is exceeded. Fix ListView.view attached property with VisualItemModel Remove dead code. Add test for VisualItemModel layoutChanged() handling Remove unused code. Handle QAbstractItemModel layoutChanged() signal
| | | * | Handle layoutChanged() properly in QML views.Martin Jones2010-08-263-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all visible items when layoutChanged() is emitted. Task-number: QTBUG-13146
| | | * | Fix ListView and GridView tests following off-by-one fixes.Martin Jones2010-08-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our tests were verifying incorrect positions... Task-number: QTBUG-12822
| | | * | Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7acMartin Jones2010-08-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemModel calls that for all sorts of reasons. Task-number: QTBUG-13146
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2629-30/+102
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| | | | |\ \
| | | | | * | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
| | | | * | | Make declarative examples a bit more qt-like.Yann Bodson2010-08-2619-10/+10
| | | | |/ /
| | | * | | Fix off-by-one at end when views scroll to keep currentItem visible.Martin Jones2010-08-262-13/+13
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endPosition() is the last pixel of the item, i.e. width-1, so must add one to ensure the entire item is visible. Task-number: QTBUG-12822
| | | * | ListView.view and GridView.view properties should not be writable.Martin Jones2010-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13166
| | | * | Avoid Flickable view jumping when drag threashold is exceeded.Martin Jones2010-08-262-2/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13176
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-261-2/+0
| | | |\ \
| | | | * | Remove dead code.Michael Brasser2010-08-261-2/+0
| | | | | |
| | | * | | Fix ListView.view attached property with VisualItemModelMartin Jones2010-08-266-9/+26
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assumed that the attached object was created at the same time as the item. Task-number: QTBUG-13166 Reviewed-by: Aaron Kennedy
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-3/+0
| | | |\ \
| | | | * | Remove unused code.Michael Brasser2010-08-251-3/+0
| | | | | |
| | | * | | Add test for VisualItemModel layoutChanged() handlingMartin Jones2010-08-252-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13146
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-254-5/+66
| | | |\ \ \ | | | | |/ /
| | | * | | Handle QAbstractItemModel layoutChanged() signalMartin Jones2010-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treated identically to reset. Task-number: QTBUG-13146
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2669-216/+4403
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| | * | | | Autotest: don't use Q_FUNC_INFO for testing which method got calledThiago Macieira2010-08-261-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string from Q_FUNC_INFO varies according to the compiler, so instead use an enum. Reviewed-by: Carlos Duclos
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-262-1/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for DEPLOYMENT.pkg_build_version fix for memory leak in QSysInfo::s60Version()
| | * | | | | Added support for DEPLOYMENT.pkg_build_versionMiikka Heikkinen2010-08-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT.pkg_build_version can be used to pad the patch version number in Symbian pkg files to allow hot-fix deployments to be done between patch releases. DEPLOYMENT.pkg_build_version accepts only values 0 - 99, as pkg patch version number has limits how large numbers it can accept. The specified number is prefixed with zero if it is single digit and then appended to patch version number. Task-number: QTBUG-13147 Reviewed-by: Janne Koskinen
| | * | | | | fix for memory leak in QSysInfo::s60Version()mread2010-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A CDir was not deleted on several return paths in QSysInfo::s60Version(). This fix uses a QScopedPointer to clean up the CDir no matter what return path is taken. Reviewed-by: Simon Hausmann
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-08-2612-28/+70
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: WGL_COLOR_BITS_ARB should not take the alpha bits into account. Fix the broken unicode detection of ODBC driver. QNAM HTTP: Prepare a compression auto test related to a future bugfix fix Norwegian Breakfast Network warnings in configure fix shadow build of configure.exe fix epic fail from 4ba6646 qmake: fix assertion on Windows when DESTDIR is empty in static libs Fix OpenGLVersionFlags on OpenGL 4.0 systems Update changes-4.6.4 with recent shader program changes Don't define highp/mediump/lowp if desktop GL has them QNAM HTTP: Fix crash related to aborted uploads QAudioOutput(ALSA); Fix check for available devices.
| | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-2612-28/+70
| | |\ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-251-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: WGL_COLOR_BITS_ARB should not take the alpha bits into account.
| | | * | | | | WGL_COLOR_BITS_ARB should not take the alpha bits into account.Trond Kjernåsen2010-08-251-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WGL_COLOR_BITS_ARB attribute is only supposed to specify the number of color bits in each buffer, *excluding* the alpha bits. Task-number: QTBUG-13141 Reviewed-by: Samuel
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-241-0/+26
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Prepare a compression auto test related to a future bugfix
| | | * | | | | QNAM HTTP: Prepare a compression auto test related to a future bugfixMarkus Goetz2010-08-231-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12908
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-241-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the broken unicode detection of ODBC driver.
| | | * | | | | | Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unicode flag is entirely overrided by mistake. Task-number:QTBUG-13109 Reviewed-by:Michael Goddard
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-204-18/+17
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix Norwegian Breakfast Network warnings in configure fix shadow build of configure.exe
| | | * | | | | fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-203-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
generated by cgit v0.12 at 2024-12-30 23:03:51 (GMT)