summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * 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>
| | * Doc: Adding style/offline.css to the global QHP configuration.Jerome Pasion2012-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | All modules wishing to use the default style will get the offline style in their QCH files. Change-Id: I37f41f72be7946a6473e6d56d4ef2f6d7c454f47 Reviewed-by: Martin Smith <martin.smith@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: Placed missing '\'Jerome Pasion2012-11-071-3/+3
| | | | | | | | | | | | | | | Change-Id: I311ea81e2cdd0069f2a93758c3cd38bc75ae0b54 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia.Jerome Pasion2012-11-072-8/+10
| | | | | | | | | | | | | | | | | | | | | Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@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-02306-3330/+4912
| | |\ | | | | | | | | | | | | 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>
| | * | Doc: Added three column layout in CSS fileJerome Pasion2012-10-291-0/+84
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a7c4538ff7eafb3dd23423c1735e27342b6391c Reviewed-by: Geir Vattekar <geir.vattekar@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>
| | * | Doc: Consolidated the QDoc variables.Jerome Pasion2012-10-263-131/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed 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>
| | * | Doc: Adding base macros and other QDoc definitionsJerome Pasion2012-10-264-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * | Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-26559-13487/+73588
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| | * | | configure: make sure that global shadow doc symlink is always updatedTor Arne Vestbø2012-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We forcibly overwrite the symlink - in case the source dir changes. Change-Id: I3986b968f787ea0d250887113a0c223e10038546 Reviewed-by: Martin Smith <martin.smith@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 06:23:28 +0000