summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-031-0/+2
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-312-1/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1163-64/+64
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Default to QDir::homePath() in Symbian native file dialogsGareth Stockwell2011-12-131-2/+2
| | | | | | | | | | | | | | | Symbian places restrictions on the directories in which the native file dialog can browse. If the path passed to QFileDialog::getXxxFileName() is inaccessible, the implementation defaults to a path which is accessible. Previously, this default path was QDir::rootPath(). Changes to the Symbian file engine in Qt 4.8 mean that this now returns "C:\" which is inaccesible to the file dialog. This patch changes the default path to QDir::homePath(), which returns "C:\data". Task-number: ou1cimx1#947939 Reviewed-by: Miikka Heikkinen
* Amend qfiledialog INTEGRITY patchHarald Fernengel2011-11-151-1/+1
|
* Remove support for tilde expansion as there is no home on INTEGRITY.Rolland Dudemaine2011-11-151-0/+2
| | | | | | | | | | | Instead of removing each use of the function, make the function do nearly nothing. If home support gets added (it is actually there when user/group support is present with full-posix mode is used), then this is trivial to remove. Also, keeps changes minimal. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix for the button size calculation in qmessagebox.cppMikko Knuutila2011-11-141-1/+1
| | | | | | | | | Actually use the calculated size for needed space instead of just ignoring the return value. Task-number: QTBUG-16315 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-281-5/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * Symbian Linuxification building case changesPasi Pentikainen2011-10-201-5/+1
| | | | | | | | | | | | | | Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-201-0/+4
|\ \ | |/
| * Maximized dialogs are incorrectly positioned after layout switchSami Merila2011-10-141-0/+4
| | | | | | | | | | | | | | | | | | The native side seems to return StaCon pane height as zero in Belle. If no StaCon pane height is available, try to fetch Status Pane height and use that one. Task-number: QTBUG-22022 Reviewed-by: Miikka Heikkinen
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-072-4/+3
|\ \ | |/
| * Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)miniak2011-10-062-4/+3
| | | | | | | | | | Merge-request: 1272 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-071-17/+0
| | | | | | | | | | | | | | according to Thiago, setting the pointer with the same values *is* thread-safe Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | fix possible race conditionsKonstantin Ritt2011-10-072-2/+3
| | | | | | | | | | | | | | | | | | the initialization guard must be set after the initialization is done; for the code assumed to be only executed in a single thread, this change was done just for consistency - in order to avoid similar issues by copy-pasting in future Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-071-5/+5
|/ | | | | | | this makes the code more consistent with similar parts and a bit more readable Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* docs: Typo and link fixes.jaanttil2011-09-271-2/+2
| | | | | | | | | | | Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix broken Solaris build (getpwnam_r usage)Iikka Eklund2011-09-221-1/+6
| | | | | | | | | | Added ifdef inside qt_tildeExpansion function to use correct version of getpwnam_r depending on _C_POSIX_SOURCE version on Solaris platform. Task-number: QTBUG-21451 Merge-request: 1380 Reviewed-by: ossi
* Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-181-1/+1
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-121-1/+1
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fix files that don't end with a newline character
| | * Fix files that don't end with a newline characterSergio Ahumada2011-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-051-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system
| | * | Fix compile errors on S60 3.2Shane Kearns2011-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20743 Reviewed-by: Liang Qi
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-041-1/+1
|\ \ \ \
| * | | | Fixed memory leak in QMessageBox::setInformativeText in Symbianmread2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian implementation of QMessageBox::setInformativeText was taking the text from a QLabel and using it in a QTextBrowser, leaving the QLabel un-parented and therefore leaking. This is fixed by setting the QMessageBox as the QLabel's parent Task-number: QTBUG-20622 Reviewed-by: Miikka Heikkinen
* | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-291-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | Conflicts: src/gui/kernel/qcocoasharedwindowmethods_mac_p.h src/gui/text/qfont_s60.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-271-1/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Save previous font engine for right bearing adjustment Fix compilation under OSX 10.7 or using llvm-gcc. Fix typo in QFontDialog docs Reset previousGlyph once we reached a new text item
| | | * Fix typo in QFontDialog docsJiang Jiang2011-07-251-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-292-7/+27
|\ \ \ \ | |/ / /
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-071-1/+6
| |\ \ \ | | |/ /
| | * | On symbian QMessageBox does not look like native dialogSami Merila2011-07-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If API QMessageBox::setInformativeText() is used to set informative text to the messagebox, the text is added to the "icon column", which makes the messagebox look really weird. Use layoutDirection() and add informative text to the same column where other text elements are added. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-052-6/+21
| |\ \ \ | | |/ /
| | * | On symbian QMessageBox icon is on different side than in native dialogSami Merila2011-07-042-6/+21
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian dialogs have layout (on LeftToRight UIs) where icon is on the right and text on left. Whereas, Qt by default has icon on the left and text on the right. Fix Qt dialogs to behave like native ones on Symbian. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
* | | Memory leak fix in Symbian open file dialogmread2011-07-281-2/+2
|/ / | | | | | | | | | | | | Symbian open file dialog was using a filter but not deleting it. Task-number: QTBUG-20357 Reviewed-by: Laszlo Agocs
* | Cocoa: QFileDialog: fix filename filter not applied correctlyRichard Moe Gustavsen2011-06-301-2/+3
| | | | | | | | | | | | | | | | | | From before, the filename filters set on the dialog were matched against the full patch of the filenames shown in the dialog. The correct way is to only match it against the filename. This becomes evident if you set a filter that has no wild cards, e.g "qmake" Rev-By: jbache
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-271-4/+73
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * \ Merge remote-tracking branch 'upstream/4.8' into 4.8Frederik Gladhorn2011-06-1264-1068/+1072
| |\ \
| * | | Fix some issues introduced in df6713b8f55fc007796f40.Pierre Rossi2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove homeDirPath(), which is part of Qt3Support. Add a #else to the #ifdef QT_BUILD_INTERNAL so that the autotest compiles also with non-developer builds. Reviewed-by: TrustMe
| * | | Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX.Pierre Rossi2011-06-081-4/+73
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3265 Reviewed-by: Thiago
* | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-242-4/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-4/+8
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | Fix SYMBIAN_VERSION_* ifdeffingMiikka Heikkinen2011-05-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileDialog and QSoftkeyManager broke in S60 5.3 platform because incorrect version ifdeffing. Task-number: QT-5065 Reviewed-by: Sami Merila
| | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
| | * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-241-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-181-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Laszlo Agocs