summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-201-2/+1
| | | | | | | | | | 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-20112-648/+5864
|\
| * Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-20112-648/+5864
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| | * 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>
| | * qdoc: better copying of .css filesMartin Smith2012-11-081-46/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Task-number: QTBUG-27878 Change-Id: Ic9ff43ab6f939cb50f1b41a9cc58f3f8686ebaf5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: Removed setting of codeindent variableMartin Smith2012-11-072-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the qdocconf files in use for Qt 5.0 set the codeindent variable to 1, which prefixes each line of a snippet with one ' '. But this messes up the cutting and pasting of snippets into editors for actual use. qdoc now lets the codeindent variable be initialized to 0, and then it never changes it. This looks ok in the default formatted html output. If the html output formatted with the template CSS files also looks ok, then the codeindent variable can be removed from all the qdocconf files, since it will no longer be used by qdoc. Task number: QTBUG-27798 Change-Id: I398c57bdfc99e747ec086fbd8ddf5994cf3ee6d5 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Cleaning up QHP information in module configuration files.Jerome Pasion2012-11-0711-133/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a common standard among all Qt modules. These changes affect the final .qch file for each module. Changes: 1)URL in qt-project.org is confirmed by DevNet maintainer url = http://qt-project.org/doc/<module> 2)Landing page title mapping indexTitle = landing page 3)"C++ Classes" as a child node. The list of C++ classes and the titles are specified in the wiki. 4)Removed extra subprojects. They are not needed for now. Each module may need additional nodes. Change-Id: I1825476c21fe9aaddc9d6b512ff74229f17271a0 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Help generator: Add a global config for "extraFiles".Jerome Pasion2012-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | There should be a way to include files across projects regardless of their project configuration. Change-Id: I61797fad594c425a30a54b73539ae670e9545cb9 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * qdoc: Added module attribute to most index elementsMartin Smith2012-11-067-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index file generated by qdoc when it is run in -prepare mode has been modified so that most elements have a module attribute. The value of the module attribute either came from an \inmodule command, or it is the value of the project variable specified in the qdocconf file that was read by qdoc. Task number: QTBUG-27626 Change-Id: I44198bbbc1738fafc110c6b905eb1d67bc745323 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-02207-1958/+1991
| | |\ | | | | | | | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| | * | qdoc: Fixed the since list for modularized QtMartin Smith2012-11-024-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required adding a "since" attribute to the index file. Task number: QTBUG-27695 Change-Id: I97ca96b837ce404ea85ca8086718be4e7a9e21a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Doc: add landing page for Qt TestLeena Miettinen2012-11-024-130/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace "QTestLib" with "Qt Test". Some style and language edits. Remove some empty headings. Change-Id: I568b4bbde981c3ef1899c830931892c16b66b4e2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
| | * | qdoc: Fixed All Namespaces listMartin Smith2012-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt5, each namespace has a URL, so the test for an empty URL fails in findAllNamespaces(). The test is now wrong and is therefore removed. Task number: QTBUG-27695 Change-Id: I888f70aff6e6e6c696e173caa91b5dcfabdab0ec Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | qdoc: Fixed All Functions listMartin Smith2012-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt5, each class has a URL, so the test for an empty URL fails in findAllFunctions(). The test is now wrong and is therefore removed. Task number: QTBUG-27695 Change-Id: If1aa823d4c59b91c67113f77a1a57c04ff7d1a02 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Qt GUI: Adding Rich Text Processing documentation from qtdocJerome Pasion2012-10-2965-0/+4803
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -included the snippets -editing for technical accuracy still to be done. -ported missing files from Qt 4 Change-Id: I0b2d27630b762c6518c08973a40b476d7852001d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-2611-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I5757741166f0f688ce0e8a4e77ed45fd4d72f1c7 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * | qdoc: Fixed All Classes listMartin Smith2012-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt5, each class has a URL, so the test for an empty URL fails in findAllClasses(). The test is no longer necessary and is removed. Task number: QTBUG-27695 Change-Id: Id3e7b17c9d68fc59340f88d1300f2a422ad2a18c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-26442-12747/+72429
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| | * | | qdoc: Adding the -log-progress optionMartin Smith2012-10-254-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc now sends progress log messages to stderr only if -log-progress appears on the command line. The progress messages are not printed to stderr if -log-progress is not used. i.e., -log-progress is off by default. Task number: QTBUG-27707 Change-Id: Id605d943506ab38639730bf16473b156d061dc53 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * | | qdoc: Don't load index in -prepare phaseMartin Smith2012-10-254-92/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was loading index files during the -prepare phase, which it shouldn't do. The index files it was loading were from modules other than the one qdoc was running on. They had not been deleted because qdoc only clears the output directory of the module it is running on. Also added a static function to the Location class to print information messages on standard error. This is useful to see what qdoc is doing and when it is doing it because these log messages are interleaved in the qdoc error messages. More of these log messages will be added as needed. Also removed some unneeded qDebug() stuff in the code that processes the dependencies from the qdocconf file. Task number: QTBUG-27707 Change-Id: I1eec8d6ec89ff040969c2a1f62f21f551f347e05 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | Add config option to build documentation as a two-step processTor Arne Vestbø2012-10-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new 'prepare_docs' CONFIG option triggers the documentation rules in default_post to generate two extra targets: prepare_docs and generate_docs. The prepare_docs stage runs qdoc with the -prepare option, which means qdoc will only generate index files, and the generate_docs stage will call qdoc with -generate, which reads the index files and generates the final output. The regular docs target will then run the prepare_docs target for all submodules before running the generate_docs target. This ensures that when generating the final output, qdoc has all the index files for all the other modules available, to be able to resolve cross-references between the various Qt modules. This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so that the root Qt5 build will be able to hook into this new behavior. Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | | Use \annotatedlist for list of examples instead of "manual links"Jan Arve Saether2012-10-241-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id945fd35f5eb6a6d11156d4a1356f99cc49405e2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | | qdoc: Clear outputdir in -prepare phase onlyMartin Smith2012-10-232-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc now clears the outputdir in the -prepare phase but not in the -generate phase. It also does not print error and warning messages in the -prepare phase. It does print fatal errors in the -prepare phase, of course, and the QML parser prints syntax errors in the -prepare phase, but all the qdoc errors and warnings are only printed in the -generate phase. Task number: QTBUG-27688 Change-Id: I9973a473260b4f79428f6b8e12a5ac35f3be15b4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | Doc: Added landing-, examples- and C++ class list-page to qtwidgetsJan Arve Saether2012-10-196-65/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems this is the pattern to follow: landing page: qtwidgets-index.html examples page: qtwidgets-examples.html class list page: qtwidgets-module.html Change-Id: I3e5459fe650178e0398cb43181b594c0f12a170e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | | Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-19143-1873/+6233
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07
| | * \ \ \ Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-1696-692/+946
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: If2168c519daf45390af04af9ef9722770453a493
| | * | | | | doc: Add a bunch of missing dependsTor Arne Vestbø2012-10-169-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32c3730f8181d73a7c8e36ef382c74b8da754269
| | * | | | | qdoc: qdoc now can run in 2 passesMartin Smith2012-10-125-26/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two command line options have been added, -prepare and -generate. If you run qdoc with -prepare, qdoc reads and parses the source files but does not generate the documentation. It only creates the .index file for the module you are running qdoc on. If you run qdoc with -generate, qdoc reads and parses the source files as well as the .index files created by running qdoc with -prepare, and it generates the documentation but no .index file. If you run without either option, qdoc runs as before, i.e. it runs both passes as a single pass. Task number: QTBUG-27539 Change-Id: Idbfe3f0f9dff58283596b504f00dff3f70f6e371 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | | | qdoc: Allow empty character literal ''Martin Smith2012-10-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc's tokenizer was reporting an error for the empty character literal ''. Now it allows it. Apparently it makes sense in .js files. Task number: QTBUG-25775 Change-Id: If407427fad9b65a035c2c4785d53c9e3d5202e62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | | | | doc: Fix a few doc errors for QtSQLTor Arne Vestbø2012-10-126-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The examples include path already contains 'sql', so we can't prefix the includes with 'sql' as well. Changing the include path to also include the parent examples directory is not an option, as qdoc will then try to generate output for example single example. Change-Id: Ifae07af86e60e6105a0625f29fbd6bc8f73b2550 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | | | | doc: add missing dep from qtcore to qtguiTor Arne Vestbø2012-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7cf8236b376376a320e2de5ca65d2cd7da91c2f Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | | QMimeDatabase: remove deprecated APIDavid Faure2012-11-201-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c241d8921ea6384c30a1731a036aec8edc7609ab renamed the methods but kept the old ones "for a week or two" at Thiago's request. Change-Id: I0747c032b549e45f6c8201db577d84863f39f599 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | | | | | Use setImage workaround on all OS X versions.Morten Johan Sørvig2012-11-201-6/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The painting bug that we are working around/fixing here has been observed on 10.7 as well. Change-Id: Ic29421bcc84405afa085af2f0ed2bc554c684f98 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | | | | SQL: Fix OCI driver's compile errors.Caroline Chao2012-11-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27979 Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | | | Fixed memory leak in assign operator of QGLBufferVadim Zakondyrin2012-11-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb51dd5a567483b415ab0e8af9eb62221225890d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 19:36:47 +0000