summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0844-1347/+2398
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * A few trivial optimizationsThorbjørn Lindeijer2010-02-054-9/+9
| | | | | | | | | | | | Don't use QHash/QMap::values/keys unnecessarily. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
| * Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | | | | | | | Task-number: QT-2603 Reviewed-by: ck
| * Small style cleanup.kh12010-02-051-6/+4
| |
| * Fix some warnings.kh12010-02-051-0/+3
| | | | | | | | Reviewed-by: ck
| * Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2010-02-043-5/+23
| | | | | | | | | | | | | | | | | | Broken by introduction of new signal with extended parameters. Emit both signals and block against each other. Tested against Eclipse integration. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-7764
| * Designer: Support the 'windowOpacity'-property for forms.Friedemann Kleint2010-02-032-2/+9
| | | | | | | | | | Analogous to windowTitle, etc. Task-number: QTBUG-7822
| * Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." ↵Robert Loehning2010-02-021-0/+20
| | | | | | | | | | | | or ".." Reviewed-by: Jan-Arve
| * Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | | | | | | | | | | | | | - Don't put the translated string into the help engine. - Don't let it be edited by users. Reviewed-by: kh1
| * Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | | | | | | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
| * Fixed handling of paths containing ".." in QFileSystemModel on Windows.Robert Loehning2010-02-011-46/+38
| | | | | | | | Reviewed-by: Jan-Arve
| * QAbstractItemModel docs: Fix typo.ck2010-02-011-1/+1
| |
| * Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| | | | | | | | | | | | | | | | Merging private tr contexts into the surrounding class keeps related strings together. Contributed-by: Ritt Konstantin Reviewed-by: kh1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-056-45/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) Get rid of setFirstActionActive on mouse release in QMenu
| * | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63. The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen was used, but WA_DontShowOnScreen should only have visual effects. Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| * | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The point in keeping this behaviour seems limited, and it is causing a bug on touch-screens where there are no mouse moves. Task-number: QTBUG-7907 Reviewed-by: ogoffart Reviewed-by: Thierry
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-054-39/+40
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings.
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | |
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | |
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| | |
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-052-0/+39
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add QMacCompatGLenum overrides for new QGLShaderProgram functions
| * | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| | | | | | | | | | | | | | | Task-number: QTBUG-7391 Reviewed-by: Sarah Smith
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0422-273/+630
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | Use a shared QScriptEngine for debugger console command scriptsKent Hansen2010-02-043-229/+233
| | | | | | | | | | | | | | | | | | | | | | | | A single engine was used for each script (i.e. command), which was just ridiculous. Use one engine with multiple global objects to isolate each script's state. Task-number: QTBUG-7227
| * | Fix QtScript debugger hang/crash issue with updating locals modelKent Hansen2010-02-042-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since the model is updated lazily, it's possible that a new model has been set on the view (and the old model deleted) before the old model has finished refreshing. This was discovered while holding down the F11 key (Step Into) when debugging plasma.js in the script/context2d example, which causes many events (and hence asynchronous model updates) to trigger rapidly.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-2/+2
| |\ \
| | * | Always activate popup windows on showJens Bache-Wiig2010-02-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that popups that were opened from a system tray icon did not get activated and clicking outside would not close the popup as intended. Ensuring that all popups get activated on show should solve this problem in the general sense. Task-number: QTBUG-7386 Reviewed-by: denis
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-045-14/+36
| |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-044-9/+16
| |\ \
| | * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen
| | * | Cocoa: Tool Windows steal focus from the main windowRichard Moe Gustavsen2010-02-043-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example that shows this off is tools/inputpanel. This example is strangely written, and calls activateWindow on the main window in an activate callback to another window. So a bit recursion will happend, and this caused troubble for the cocoa port. In addition, in Qt several windows can be active at the same time, expecially tool windows. This means that we need to be careful when returning early from the becomeKeyWindow methods for NSWindow. This patch fixes up on this stuff. Task-number: QTBUG-6002 Reviewed-by: msorvig
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-043-1/+30
| |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-0/+269
| |\ \
| | * | Update QTestLib documentation with chart use case.Fabien Freling2010-02-042-0/+269
| | | |
| * | | qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-043-6/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed wrong variable name QHeaderView: fixes sectionClicked() emitted with wrong section index
| * | | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Olivier
| * | | QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2010-02-042-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The obvious fix is to use the previsously computed 'section' as paramatter. (It is even faster) But one might wonder why logicalIndexAt() does not return the same result before and after flipSortIndicator(). The reason is that while being sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden again. Leaving some pending computation. Task-number: QTBUG-7833 Reviewed-by: Gabriel
* | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-04138-578/+30474
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits) Rhys Weatherley's changes for 4.6.2 Autotest: to be sure, generate .cpp files with the proper headers too Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers revert to fromUtf16() usage in fromWCharArray() S60 softkey refactoring (support for merging, priorities and menus) Implementation for QVGPixmapData to/fromSymbianCFbsBitmap Updated changlog 4.6.2 Fix license headers on these new files (and the generator). Add auto-generated tests for QScriptValue Add changes for 4.6.2 Assistant examples: Fix missing QLatin1String. Changelog: Added Designer/uic3 changes for 4.6.2 Revert "Improve raster graphics system performance on Mac." Added Czech translations. Introduce of QScriptValue autotest generator. Revert "Update default FPU flags on Symbian to be softvfp+vfpv2" Fixed potential crash in mac style ...
| * \ \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-04138-578/+30474
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Rhys Weatherley's changes for 4.6.2
| | * | | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| | | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-0420-216/+805
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-0320-216/+805
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Adjust rw base address for gui built with GCCE for Symbian OS Added descriptions of translatable strings for Phonon MMF reverb effect Corrected namespace for Phonon::MMF translatable error strings Compile fix for non-Symbian compilers S60 softkey refactoring (support for merging, priorities and menus) Daylight savings time for Symbian take 2
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-033-9/+30
| | | |\ \ \ \ \
| | | | * | | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error strings are now part of the Phonon::MMF namespace. Reviewed-by: trustme
| | | | * | | | | Compile fix for non-Symbian compilersAlessandro Portale2010-02-031-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Putting the code for "case CT_ComboBox:" into {}
generated by cgit v0.12 at 2025-01-01 04:34:26 (GMT)