summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3058-212/+165
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * Merge branch '4.5'Thiago Macieira2009-06-241-1/+1
| |\ | | | | | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | * QColorDialog: Fix setting of alpha valuesMarkus Goetz2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When alpha was changed and then another color was picked in the GUI still the old alpha remained (good) but it was not returned in the returned color (bad). Task-number: 256164 Reviewed-by: jasplin
| * | More culling of Panther Code.Norwegian Rock Cat2009-06-231-76/+7
| | | | | | | | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| * | Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-232-4/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-232-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-0/+26
| |\ \ | | |/ | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * Prevented QWizard from crashing upon removing a page after deleting a field ↵jasplin2009-06-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object. QWizard crashed when removing a page after deleting an object that was already registered as a field for the page. This patch prevents such a crash by doing the necessary cleanup immediately when the object is deleted. QWizard::removePage() will then see a consistent state in this case. Reviewed-by: janarve Task-number: 255350
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | * Made QInputDialog::getText() return null QString when rejectedStian Sandvik Thomassen2009-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a behavior change introduced with Qt 4.5.0 where QInputDialog::getText() returned the line edit's text when the dialog was rejected. However, the behavior since Qt 4.0 has been to return a null QString when the dialog is rejected. Task-number: 256299 Reviewed-by: Andy Shaw
| * | QFontDialog: fixed the current font not being updatedThierry Bastian2009-06-181-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | This could happen when the list of styles depending on the font is different from the font you selected before. It then is not updated and the style of the font returned by the QFontDialog is wrong. Task-number: 256466
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1658-115/+115
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1658-115/+115
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Manually fix bad merges and make sure everything compiles with 4.6.Harald Fernengel2009-06-291-1/+1
| | |
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2522-213/+205
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETERThomas Hartmann2009-06-101-0/+3
| | | | | | | | | | | | | | | Task-number: 253086 Reviewed-by: Joerg
| | * Change order of functions in QInputDialog::getDouble()Markus Goetz2009-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes issue with decimals in the spinbox used for the double Task-number: 255502 Reviewed-by: mbm
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-1110-17/+17
| | |
| * | remove q->layout() and q->parentWidget() code where unnecessaryThierry Bastian2009-06-111-8/+6
| | |
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-044-6/+15
| |\ \ | | |/
| * | missing opening paragraph tagFrederik Schwarzer2009-06-031-1/+1
| | | | | | | | | | | | | | | Merge-request: 578 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-023-3/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * | | Polished aboutQt dialog a little bit.Denis Dzyubenko2009-05-281-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitted text in the AboutQt dialog into several chunks to make use of advanced qmessagebox text fields Reviewed-By: Trenton Schulz
| * | | Merge branch '4.5'Tom Cooksey2009-05-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * | | | improved string operations all over the placeThierry Bastian2009-05-282-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | | | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-273-13/+46
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * | | | | Compile fixThierry Bastian2009-05-251-1/+1
| | | | | |
| * | | | | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-255-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
| * | | | | Added a "Qt 5 FIXME" comment to qmessagebox.h.jasplin2009-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMessageBox::question() has the wrong default value for one of its arguments, but fixing it may break existing code, and the workaround is trivial (just specify an explicit value for the default argument). Reviewed-by: TrustMe Task-number: 254131
| * | | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-12/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-05-183-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * | | | | | | Fixed regression introduced by fix for Task 177022.jasplin2009-05-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for Task 177022 broke the fix for Task 163334. This commit fixes the regression. Reviewed-by: janarve
| * | | | | | | Merge branch '4.5'Thiago Macieira2009-05-141-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * | | | | | | | Work around a limitation in QFormLayout - 0 width content marginsTrond Kjernaasen2009-05-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aren't really supported. Also set the default focus to be the preview widget itself.
| * | | | | | | | Make the QPrintPreviewDialog use a QMainWindow with a proper QToolBar forTrond Kjernaasen2009-05-121-79/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | its buttons.
| * | | | | | | | Add support for CMYK colors for the native QColorDialog on Mac OS X.Benjamin Poulain2009-05-112-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native color picker on Mac supports CMYK colors but this was not available with QColorDialog because the colors were systematically converted to RGB. The color are now initialized with QColor and the result from the color panel is converted to the right format. Task-number: 253272 Reviewed-by: nrc
| * | | | | | | | Merge branch '4.5'Thiago Macieira2009-05-112-2/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * | | | | | | | | | QFileDialog::getOpenFileNames() is not shown at the correct positionRichard Moe Gustavsen2009-05-041-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct behaviour for native file dialogs on mac is to use the previous size and location settings when reopening the dialog. So we implement this behaviour with this change Task-number: 250182 Reviewed-by: Trenton Schulz
| * | | | | | | | | | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2911-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
| * | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-292-5/+7
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-04-281-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before adding a / to the path one should check if it doesn't end with one already. Otherwise one might get paths like //My Documents on WinCE causing the native call to crash the filesystem service on that system. Reviewed-by: alexis
* | | | | | | | | | | | added namespace guardsJanne Koskinen2009-06-171-2/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Remove compiler warning on Qt/WindowsHarald Fernengel2009-06-152-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QFileDialogPrivate constructor must be non-inline. RevBy: aportale
* | | | | | | | | | | | Make Qt exception safer.Robert Griebl2009-06-1010-61/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-084-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * | | | | | | | | | | Document the proper signals that the ::open() convenience connects to.Norwegian Rock Cat2009-06-044-6/+15
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were saying that it connected to accepted it all these cases, but it actually is doing some nice magic that makes sense assuming you document it.
generated by cgit v0.12 at 2024-12-26 20:16:29 (GMT)