summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-259-67/+430
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-248-9/+400
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits) Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. ...
| | * Fix spacesJanne Koskinen2010-11-232-2/+2
| | | | | | | | | | | | | | | | | | Remove extra spaces Reviewed-by: Miikka Heikkinen
| | * Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native color dialog implementation for Symbian. During merge extra libraries removed. Task-number: QT-3917 Reviewed-by: Sami Merila Merge-Request: 932 Reviewed-by: Janne Koskinen
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-191-1/+1
| | |\
| | | * Add symbian scope for qfiledialog_symbian.cppMiikka Heikkinen2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Missing symbian scope caused build break on non-symbian platforms. Reviewed-by: Janne Koskinen
| | * | Corrected ASCII comparison and removed extra bracesTitta Heikkala2010-11-192-20/+15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected ASCII comparison and removed extra braces based on comments Task-number: QT-3917 Reviewed-by: Janne Koskinen Merge-request: 918 Reviewed-by: Janne Koskinen
| | * Removed extra cpp and done changes based on commentsTitta Heikkala2010-11-183-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcolordialog_symbian.cpp is removed from dialogs.pri and string comparison corrected based on comments. Task-number: QT-3917 Reviewed-by: Janne Koskinen Merge-request: 918 Reviewed-by: Janne Koskinen
| | * Correct flags for Symbian file dialogsTitta Heikkala2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected the flags for extern functions Task-number: QT-3917 Reviewed-by: Janne Koskinen Merge-request: 918 Reviewed-by: Janne Koskinen
| | * Documented usage of dialogs on SymbianTitta Heikkala2010-11-153-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added quidance to documentation about using print dialogs on Symbian. Task-number: QT-4247 Reviewed-by: Sami Merila Merge-request: 920 Reviewed-by: Sami Merila
| | * Native file dialog on Symbian^3Titta Heikkala2010-11-153-9/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static functions in QFileDialog use native file dialog and not QFileDialog on Symbian^3. Task-number: QT-3917 Reviewed-by: Sami Merila Merge-request: 918 Reviewed-by: Sami Merila
| * | QMessageBox: change the documentation to reflect that it is application modalOlivier Goffart2010-11-221-58/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | QMessageBox was documented to be window modal, but it is actually application modal. Changing the behaviour now would be dangerous, as QMessageBox reenter the event loop. So update the documentation. Task-bumber: QTBUG-14499 Reviewed-by: Joao Reviewed-by: Denis
* | Fix a namespace error and some warnings found by clangJiang Jiang2010-11-233-4/+4
| | | | | | | | Reviewed-by: Fabien Freling
* | Fix some warnings on MacJiang Jiang2010-11-221-1/+1
| | | | | | | | Reviewed-by: Fabien Freling
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-0/+3
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Wordwrap QInputDialog label in SymbianJanne Koskinen2010-11-041-0/+3
| | | | | | | | | | | | | | | | | | Enable wordwrapping for QInputDialog in Symbian to allow longer texts to be displayed without cutting them off. Fixes issue with javascript prompt not showing long texts. Task-number: QT-4008 Reviewed-by: Sami Merila
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-11/+34
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-031-11/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| | * Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-211-11/+34
| | | | | | | | | | | | | | | | | | Previously, the code showed how to use QDirModel and was included in the QDirModel class documentation, but it has since been changed to use QFileSystemModel instead.
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-091-0/+6
| | |\
* | | \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-1/+4
|\ \ \ \ | |/ / /
| * | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-263-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-091-5/+5
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns ...
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-041-9/+0
| | | |\
| | | * | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
| * | | | removed shlobj.h to prevent different redefinitions for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | make QFileDialog completer return proper dirnames in rootZeno Albisser2010-10-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced with fa46fa236b5f4a9a5677da2e7464a6b9f8b7b5f3 Reviewed-by: Joao
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-225-9/+69
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | | | Explicitly inherit from NSOpenSavePanelDelegate on Mac OS 10.6 and aboveTor Arne Vestbø2010-10-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to Mac OS 10.6 this was an informal protocol. Reviewed-by: Morten Sørvig
| * | | | Revert "Explicitly inherit QNSOpenSavePanelDelegate from ↵Tor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSOpenSavePanelDelegate" This reverts commit 24e0f64b8a35ddbfeae2f0611d3f1779fb56cdb0. NSOpenSavePanelDelegate is not available on Mac OS X 10.5. Reverting this until a solution can be found so that the staging area is not blocked.
| * | | | Fix the build on Mac OS X after 24e0f64b8a3Tor Arne Vestbø2010-10-151-0/+1
| | | | |
| * | | | Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegateTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | Don't assing 'const Foo*' to a 'Foo*'Tor Arne Vestbø2010-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | Disable selection of Libraries on Windows 7 in getExistingDirectory().Prasanth Ullattil2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Libraries on Windows 7 are user-defined collection of folders, which is only a logical representation. There are no file system entries associated with it . This patch makes sure that user cannot choose a library when using the QFileDialog::getExistingDirectory(), in such cases it will show a standard windows warning message. Task-number: QTBUG-12655 Reviewed-by: Thierry Bastian
| * | | | Extended the convenience functions for QInputDialog for IM hints.axis2010-10-082-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input method hints make a lot of sense when requesting specific information from the user, such as for example a URL. Therefore we include input method hints in the static convenience function. To maintain BC we need to keep the old symbol around, so a new function was added. To maintain SC, there cannot be any ambiguities when deciding which function to link to, therefore the function with the fewest arguments get to keep all the default arguments, whereas the new function gets a new explicit argument. AutoTest: Passed Task: QTBUG-13200 RevBy: Denis Dzyubenko
| * | | | Merge branch '4.7-s60' into master-s60axis2010-10-081-0/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp
| | * | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-081-0/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | AutoTest: Included Task: QTBUG-13200 RevBy: Denis Dzyubenko
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-9/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-9/+0
| |\ \ \ | | |/ /
| | * | Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.Trond Kjernåsen2010-09-281-9/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | The Qt::WA_DeleteOnClose bug was fixed some time ago, while this workaround was "forgotten" in the QPrintDialog code. It actually causes a crash and is no longer necessary. Task-number: QTBUG-11430 Reviewed-by: Prasanth
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-1/+0
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| | * remove extra includesRitt Konstantin2010-09-211-1/+0
| | |
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-132-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-9/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-072-9/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-032-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a security hole that has been there for a while, but the public awareness have recently rised so the threat is more imminent now. The solution is to fix all places where we dynamically load system libraries. More specifically, we now load all system libraries with an absolute path that points to a library in the system directory (usually c:\windows\system32). We therefore introduce a small class named QSystemLibrary that only loads libraries located in the system path. This shares some of the API with QLibrary (in order to make the patch as small as possible). We don't fix QLibrary due to risk of regressions. In addition, applications can fix the code that calls QLibrary themselves. The problem does not apply to Windows CE, since the search order is documented as not searching in the current directory. However, it touches some CE-specific code - therefore QSystemLibrary is sometimes used on WinCE (however, it will just do a normal LoadLibrary() since its safe anyway). This change does not affect the testability plugin (it is not clearly documented where that plugin is located, and the plugin should never be used in production code anyway) Loading OpenSSL libraries The ssl libraries are handled specially, and searched in this order (we cannot expect them to always be in the system folder): 1. Application path 2. System libraries path 3. Trying all paths inside the PATH environment variable Task-number: QT-3825 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| | | * Initalize the nativeDialogInUse variableAndy Shaw2010-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the variable was not initalized it would randomly show a native font dialog or a non native one if the DontUseNativeDialogs flag was set. Task-number: QTBUG-12042 Reviewed-by: cduclos
generated by cgit v0.12 at 2025-08-31 02:24:50 (GMT)