summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Doc cleanup] Fix typos and style of QAbstractButton, QButtonGroup, ↵David Gil2012-11-214-50/+49
| | | | | | | QCheckBox and QRadioButton Change-Id: Ie557f865f5bdec7241abced91bf10cee8feaf9d9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Enable gui build with QT_NO_SYSTEMTRAYICONTasuku Suzuki2012-11-211-2/+2
| | | | | | Task-number: QTBUG-24816 Change-Id: I5b53392bee3990ec5c7235cc615b4a477fb62089 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Accessibility: unhide text() function in TextWidget subclasses.Frederik Gladhorn2012-11-211-0/+7
| | | | | Change-Id: Ib5a64ff8de175d1ffc6e4357ec9ec45c4c2f2917 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Made QWindowsXPStyle internalJ-P Nurmi2012-11-219-438/+437
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy and even merging style implementations (XP & Vista) later on, without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QWindowsXPStyle directly. Change-Id: Ib4fec35c2fcb3b5a193537a1de5b6e26fbbe0a06 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Made QWindowsVistaStyle internalJ-P Nurmi2012-11-217-241/+241
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy and even merging style implementations (XP & Vista) later on, without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QWindowsVistaStyle directly. Change-Id: I8b320036e241e877fc9bb5f4084cc6e63756cbc4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* BlackBerry: Changed QSettings file accessBernd Weimer2012-11-213-6/+88
| | | | | | | | | | | | | On the BlackBerry platform, applications run in a sandbox. They are not allowed to read or write outside of this sandbox. Hence in QSettings there is no use for the system scope and differentiating between organization and application. This change will also improve performance. Change-Id: I79fee0140595385f3d33bd89fe5daa36b04836bc Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* BlackBerry: Restore proper BPS channel in event dispatcherBernd Weimer2012-11-211-8/+36
| | | | | | | | | | This change ensures that BPS events are delivered to the proper channel even if the application code would change the channel. Change-Id: Id44efbdd99350c639e391161dd89b8d422c4b330 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Jeff Kehres <jkehres@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QtBase: examples/widgets/layouts coding styleDavid Schulz2012-11-2110-18/+14
| | | | | Change-Id: I4340c1fcbb467bf3c2ace3b4bd4b042fe9521c35 Reviewed-by: hjk <qthjk@ovi.com>
* Handle QEventLoop::ExcludeUserInputEvents in QWindowSystemInterface.Friedemann Kleint2012-11-212-36/+45
| | | | | | | | | | | Add a flag indicating user input events to the event type and leave those events in the queue if QEventLoop::ExcludeUserInputEvents is set. Task-number: QTBUG-27595 Change-Id: Ib41b826ef3be19253cd582d9894dd7c87953711f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Properly initialize glViewport() to appropriate value in QGLPixelBuffer.Samuel Rødal2012-11-211-0/+1
| | | | | | | | | | Since we are using a hidden window in order to make the context current, the viewport will end up with an arbitrary value. By setting it explicitly we ensure compatibility with Qt 4. Task-number: QTBUG-28115 Change-Id: I69fb5efda2b274b539c3d3b9fa842a2d32ad70b1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Mac: fix invalid context in imageForGlyphTeemu Katajisto2012-11-211-1/+1
| | | | | | | | | | | | The bounding rectangle may have negative width or height when a graphics view with text is rotated in certain angles. Make sure that the image width and height are positive, otherwise the context will be null and the following messages can be seen in test logs: <Error>: CGContextSetFontSize: invalid context 0x0 Change-Id: I10f83f6909035fb3c4ac456123cf1922eaea7c73 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix MinGW compilation for tst_qwinoverlappedionotifierJonathan Liu2012-11-211-3/+10
| | | | | | Change-Id: I664761e7e6fd1c00067ae1def496ba4974e539be Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QNX: Fix crash due to re-entering QToolTip::show().Sergio Martins2012-11-211-2/+6
| | | | | | | | | | | | | | | | | | | The flushWindowSystemEvents() was added to send the geometry event synchronously. A side effect was that all input events were also sent. We don't want that. We're probably in setGeometry() because some other input event brought us here, and it's still in the call stack. One crashy example is the static method QToolTip::show() which uses static variables([1]). If we process input events while the first QToolTip::show() is still on the call stack, it will trigger a second one, deleting stuff ([1]) that the first invocation will still need once the stack unwinds. Change-Id: Iea22419a7f386d6b6231404666092340dfd1afed Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* qdoc: Make image paths relative to html fileMartin Smith2012-11-211-4/+5
| | | | | | | Task-number: QTBUG-28080 Change-Id: Ie552cacdf736f9f6da3148a11ef2362248775e1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Various modifications to the online and offline stylesheets.Jerome Pasion2012-11-212-66/+40
| | | | | | | | -used Qt Project colors -changed margins and paddings Change-Id: If7a533ac3a32debbaca7b403aa68290c2b9aab2c Reviewed-by: Martin Smith <martin.smith@digia.com>
* Made QFusionStyle internalJ-P Nurmi2012-11-2111-235/+229
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy, pluginizing etc. without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QFusionStyle directly. Change-Id: I37d8acb13b6fd328a9cd53c74df971428bbbe443 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix possible crash/assertion in qt_fontHasNarrowOutlines()Konstantin Ritt2012-11-211-4/+10
| | | | | | | | | 1. cloneWithSize() may return 0 1bis. QRawFont::setPixelSize() may ivalidate the font (due to 1.) 2. using the data obtained from a temporary QString is never safe! Change-Id: I0cd5f807d8077ef5112704e475f1904bd6fc4b1b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QPAEventDispatcherGlib: Use correct flags when sending eventsOliver Wolff2012-11-212-3/+18
| | | | | | | | | | Instead of assuming that all events should be handled when a user event occurs, userEventSourceDispatch has to use the flags used in QPAEventDispatcherGlib::processEvents. Task-number: QTBUG-27595 Change-Id: Ib13607f89f7d3207ec83ab26f7d59b3c59a28c4e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* SIC QPrintSupport: Remove unused PPK_SuppressSystemPrintStatusJohn Layt2012-11-214-7/+2
| | | | | | | | | Print Engine key PPK_SuppressSystemPrintStatus was added in Qt4.1 for Cocoa dialog to suppress the progress dialog. In Qt5 all cocoa code has been removed and this key is now unused. Change-Id: I3a91e9651e16f81611a9a736163f76acf9f20096 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Patch file for ANGLE for fixing blackscreen after minimizeMiikka Heikkinen2012-11-211-0/+45
| | | | | | | Task-number: QTBUG-27994 Change-Id: Iee3d9ff992b0d99c9d1ec3f13631c137114a52a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QJpegHandler: err should be set before jpeg_create_decompress()Elvis Lee2012-11-211-2/+3
| | | | | | | | | | If ERREXIT2 is called in jpeg_create_decompress(), SIGSEGV occurs with no error message. ERREXIT2 macro uses jpeg_compress_struct.err to handle error case. Change-Id: I8517a4d6f6e6aa4c1c59cd1aaea435554cca7ac3 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Qnx: Handle the MeasurementSystem value in QNXmfekari2012-11-202-0/+103
| | | | | | | Change-Id: I00837421431d82aa831b785d3effb0920b4541f3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix regression in QXmlStreamWriter with codec set to UTF-16Jan Arve Saether2012-11-202-7/+47
| | | | | | | | | | | | | Actually, this broke using QXmlStreamWriter with any codec where characters in the ASCII range have a different encoding than the ASCII standard. This was a regression from 558fe9383ba0aecbec09cc411c0ebab132aac137 Task-number: QTBUG-23310 Change-Id: I75bd013e9d5de53da564a76c2f06e95ff35303a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QProxyStyle: fix the base style assignment in constructorJ-P Nurmi2012-11-201-1/+1
| | | | | | | | | | Assign the baseStyle member before calling setParent(), because that will trigger ParentChange event and thus calls ensureBaseStyle(). The baseStyle member must be set at that point, because otherwise it will start creating a fallback base style. Change-Id: I3522e41bb6b82e3fe2e7790d53a53978c18a027a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Detect Unity by checking XDG_CURRENT_DESKTOP and use Gnome theme.Friedemann Kleint2012-11-203-3/+9
| | | | | | | | | | Fallback to Gtk for unknown desktops, which should be suitable for most cases like XFCE. Task-number: QTCREATORBUG-8254 Change-Id: Iaf9959f75852e03a83b5af7d0dead01ef657d678 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* don't run syncqt three times in debug_and_release configsOswald Buddenhagen2012-11-201-12/+14
| | | | | | Change-Id: Ifdf7727444779ffa79d9f2ec908d24d1e0663c21 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't set CONFIG+=release during build passesOswald Buddenhagen2012-11-202-3/+2
| | | | | | | | | | otherwise we get inconsistent builds. Task-number: QTBUG-28046 Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix black screen after minimizing OpenGL window with ANGLEMiikka Heikkinen2012-11-201-0/+16
| | | | | | | | | CreateTexture will fail on zero dimensions, so just release old target and reset dimensions when resetSwapChain is called with zero size area. Task-number: QTBUG-27994 Change-Id: I1e500c4fd4b92f7d9ea2a49a44f3fb930b575cd1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fixed rendering artifacts when drawing cursor.Samuel Rødal2012-11-201-1/+1
| | | | | | | | Get rid of the + 1 in addition to the ascent and descent. Task-number: QTBUG-27658 Change-Id: I8721226a034099ebe348cad3c49ac711c7fe44b9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QHeaderView - do not keep indexes from an obsolete modelThorbjørn Lund Martsum2012-11-201-0/+1
| | | | | | | | | | | | | When we call setModel persistentHiddenSections are no longer relevant. It contains indexes from the previous model. This solves: Task-number: QTBUG-18196 Change-Id: Ida02fa63a915695e3730fd63995ac5f8520ae827 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Made QGtkStyle internalJ-P Nurmi2012-11-209-588/+589
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example some styles could be even separated out of QtWidgets and be provided as plugins instead. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QGtkStyle directly. Change-Id: Iea1f7ebc80949d29f02733f81674355578e2e4fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* exclude 3rdparty from lupdateOswald Buddenhagen2012-11-2010-0/+18
| | | | | | Change-Id: I00c569787943a87dda60786b179af1f55a94ea68 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* create interface QSqlDriver::cancelQuery()Sune Vuorela2012-11-202-1/+27
| | | | | | | | | This is useful for canceling a long running sql query. Note that it needs support from the individual drivers. Change-Id: Ia170a70487ff4ee13c85f12bc13e62fb198617fe Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Handle Qt::WA_MacSmallSize in QApplication::font(const QWidget *).Friedemann Kleint2012-11-201-0/+8
| | | | | | | | Task-number: QTBUG-27669 Task-number: QTBUG-27665 Change-Id: Id7eb8092076a57a755a53d1eb5c46d706756ca81 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge "Merge branch 'newdocs'" into refs/staging/masterSamuel Rødal2012-11-20182-780/+7882
|\
| * Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-20182-780/+7882
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added prepare_docs to qt_build_config.prf (it was added directly in configure in the source branch) Conflicts: configure tools/configure/configureapp.cpp Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
| | * Added doc with IO functionsNico Vertriest2012-11-201-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor spelling and editorial issues see remarks J.Pasion 30 Oct. Corrected syllabifying error and minor punctuation issue Added link to Qt Core in introduction Change-Id: I1516c94c7f9b70125801ab7f9dfeeaed94db6d91 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Changing titles in HTML template.Jerome Pasion2012-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | -Easier to differentiate the links. Change-Id: I9294affcdbf037d91d94fa707449d78fac01bcbb Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Doc: Adding subtitle to the online snapshot HTMLJerome Pasion2012-11-192-36/+124
| | | | | | | | | | | | | | | | | | | | | -other fixes to the HTML template. Change-Id: I85070c615796c4342a89cc730ab2ca8ab51dd5e6 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Doc: Adding online stylesJerome Pasion2012-11-1935-3/+794
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Has the Qt logo -For generating the archives and online snapshot Change-Id: I88d1d6335c0ba600a62868a25fadaed8a751f2b4 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Removed "class=" in an /div.Jerome Pasion2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | -not valid XML Change-Id: I832490e87113d9143b2280127b539c68a46b0e94 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * qdoc: Handle extra imahes exactly like stylesMartin Smith2012-11-161-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The values of the extraimages variable in the qdocconf file must now be paths that are relative to the location of the qdocconf file, just like for styles. They can be absolute paths, of course, but if they are relative, they must be relative to the qdocconf file containing the extraimages variable. The extraimages variable is for including images used in the HTML heard and footer that are not referred to in the documentation. Task-number: QTBUG-27878 Change-Id: If5e0d1dee7ba231a9c1a73f02a1bbaeb7bfe52c8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: Handle scripts exactly like stylesMartin Smith2012-11-161-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The values of the scripts variable in the qdocconf file must now be paths that are relative to the location of the qdocconf file, just like for styles. They can be absolute paths, of course, but if they are relative, they must be relative to the qdocconf file containing the scripts variable. Task-number: QTBUG-27878 Change-Id: Iec12d1937ca9db540a2aa5e378fadc60de0a2d8c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: Removed debug codeMartin Smith2012-11-163-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | Just removing calls to qDebug(). Task-number: QTBUG-27878 Change-Id: I592ddbb8541b5b65aee9e0f940b50217e84b3a5e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Removed "templatedir" from qdocconf file.Jerome Pasion2012-11-161-2/+1
| | | | | | | | | | | | | | | | | | | | | No longer needed as the paths are resolved relative to the file. Change-Id: Id4012336b7de00a5dcf8686e44f7a972e2b8b284 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * qdoc: better copying of .css filesMartin Smith2012-11-166-85/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ignores templatedir for css files. It assumes that the paths in the stylesheets variable are relative to the qdocconf file that contains the stylesheets variable. Task-number: QTBUG-27878 Change-Id: I2155e58f352e17d710c93ad4e92679beb169d823 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: better copying of .css filesMartin Smith2012-11-144-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix searches for the css files specified in the stylesheets variable. It searches for them in the directory specified as the templatedir. It copies them into the style subdirectory of the outputdir. It also tests QT_INSTALL_DOCS before setting it to the library info. If it was set on the command line, it is not set from the library info. This change also includes some debug code, which will be removed after testing. Task-number: QTBUG-27878 Change-Id: I7a9469b840e13b966aca44b99aebba102e5d4f0c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Adding \externalpage links to qtbase/doc/globalJerome Pasion2012-11-135-0/+748
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Moved from qtdoc repository -included in the default configuration for each module -grouped links Change-Id: I544d9232950f50ae9fb877c1a0166ab157f70942 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Doc: Fixing templatedir paths according to the fix to QTBUG-27878Jerome Pasion2012-11-092-1/+2
| | | | | | | | | | | | | | | Change-Id: Ib95be5267514e4afadad4f6fbfd48514a7552227 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Doc: Adding necessary HTML elements in the HTML template.Jerome Pasion2012-11-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | -needed by qt-project.org -won't affect the qch style Change-Id: I720a5cae2ea12e8a3dd81ce10b7c003981d61cd8 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>