summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Assistant: Compile fix, missing header include.v5.6.0Karsten Heimrich2016-02-261-0/+2
| | | | | | | Task-number: QTBUG-51409 Change-Id: I1f131c5efa3030c363adec945b021e9775be86e5 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: dmnikola <dmitry.nikolaev@theqtcompany.com>
* Fix WEC7 buildv5.6.0-rc1Andreas Holzammer2016-02-041-0/+10
| | | | | | | | | lower_bound does require some additionally operators in order to pass lower_bound static checks. Task-number: QTBUG-50856 Change-Id: I363bb57014b8d76feea131205ed4fd32e3504197 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-0222-155/+250
|\ | | | | | | Change-Id: I2e48d2627ada8184716916070c2d3cec200e2cb2
| * qtdiag: Add option --fonts for verbose output of QFontDatabase.Friedemann Kleint2016-01-293-7/+51
| | | | | | | | | | | | | | | | Output font families, sizes and writing systems. Also output subpixel hinting of the screens. Change-Id: I117765d3413bf1ede3ccfd6f3f1e06bee9a56957 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * FormWindow::layoutContainer(): Fix check for empty child widget list.Friedemann Kleint2016-01-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | Move check after filtering out the non-managed widgets. This fixes a crash happening in QMainWindow forms where the central widget is manually edited to a container-type widget. Task-number: QTBUG-50563 Change-Id: I4df600fe0a63ecfbb8be741f8c3d8027cee7528b Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
| * Qt Assistant: Set Qt::AA_EnableHighDpiScaling.Friedemann Kleint2016-01-271-0/+1
| | | | | | | | | | | | | | | | | | Enable automatic scaling for the documentation on High DPI screens. Task-number: QTBUG-50698 Change-Id: I155ff2309efa518aad5ca618a9abeac96ea57d4f Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Polish PixelTool.Friedemann Kleint2016-01-274-125/+169
| | | | | | | | | | | | | | | | | | | | | | - Use Qt 5 connection syntax, streamline context menu code accordingly. - Streamline code, use constructor initialization, Q_DECL_OVERRIDE. - Introduce QCommandLineParser, add an option to turn off scaling. - Fix image file dialog. - Fix the cursor position display to always display native pixels. Change-Id: I534eed2144acf6c6c868af725ac6e01ab93bdd88 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| * Bump copyright yearKai Koehne2016-01-2711-11/+11
| | | | | | | | | | | | Task-number: QTBUG-50578 Change-Id: Ief1031dd179b9a22314f48c550aa234a3d143eb0 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Use QMakeVfs to test existence in pro file evaluatorTakumi ASAKI2016-01-271-9/+9
| | | | | | | | | | Change-Id: I5e8f93e78c12413b0ca86f0f5132585c527b7a5f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Highlight QTabWidget tabs by making them currentFrederic Marchal2016-01-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | If the text to translate is a QTabWidget tab label, the whole QTabWidget is highlighted but the tab inconspicuously remains unselected. The translator wastes precious seconds searching for the text in the preview (at least I do, even with three tabs). Moreover, automatically bringing the tab to the front let the translator see what the (usually terse) tab label refers to. Change-Id: I85ee872403b276ebd740cfb9542efc1f7debb40c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Remove deprecated signing option that causes warnings.Alexandru Croitor2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Codesign preserve-metadata option does not support the "resource-rules" value any more, it has been deprecated since OSX 10.10. Change-Id: Id993cfcc34a66edfa075a94d7d32804a64f45a6e Task-number: QTBUG-50636 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | Fix macdeployqt to properly sign inner bundles.Alexandru Croitor2016-01-282-7/+77
|/ | | | | | | | | | | | | | QtWebEngine uses a framework called QtWebEngineCore which contains an inner bundle called QtWebEngineProcess.app. Because it was not signed in the proper order, the whole signing process failed. Fix consists in checking if there are any inner app bundles inside frameworks, and sign them before signing the rest of the main bundle. Change-Id: I48abe26d1e61cd1ce17cb185bcd8d1d72f6c9607 Task-number: QTBUG-50636 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* highlight combo box items by making them currentOswald Buddenhagen2016-01-221-3/+5
| | | | | | Change-Id: I6511cc5de194d3fda55adea6916f9728ffffe99b Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* bringToFront: support item view itemsOswald Buddenhagen2016-01-221-25/+30
| | | | | | | | | | | instead of blatantly assuming that every TranslatableEntry is a widget, actually check the entry type and use the parent item view (instead of crashing) if it's an item. Task-number: QTBUG-50068 Change-Id: I781d00226894f074e2a3eb0bd0db84e7a28231b0 Reviewed-by: Frederic Marchal <frederic.marchal@wowtechnology.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* don't unnecessarily use qobject_cast<>Oswald Buddenhagen2016-01-221-4/+4
| | | | | | Change-Id: I12242ae48b00fc7789009b8ddf967c21a2cf3513 Reviewed-by: Frederic Marchal <frederic.marchal@wowtechnology.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* bringToFront: fix handling of QTabWidgetsOswald Buddenhagen2016-01-221-5/+9
| | | | | | | | | relying on them being handled implicitly by the QStackedWidget handling leaves the tab bars out of sync. Change-Id: Iecfc3600297846e70a48bc2ecf31921be29f48ab Reviewed-by: Frederic Marchal <frederic.marchal@wowtechnology.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* bringToFront: add support for QToolBoxOswald Buddenhagen2016-01-221-0/+6
| | | | | | | Change-Id: Ia9763d9f620cd55329e400e1578547db6d83d342 Reviewed-by: Frederic Marchal <frederic.marchal@wowtechnology.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* bringToFront: remove broken support for QStackedLayoutOswald Buddenhagen2016-01-221-2/+0
| | | | | | | | | | | | the code tried to make the widget current in the child layout instead of the parent layout. QStackedLayout is not supported by QtDesigner anyway, so just remove the code. Change-Id: I5696daee2fd655c6e42b365680a02d78c7c1258a Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Frederic Marchal <frederic.marchal@wowtechnology.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Register the right number of QTableWidget header texts to translateFrederic Marchal2016-01-221-2/+2
| | | | | | | | | When linguist parses a QTableWidget from a ui file, the column count is the number of horizontal headers and the row count is the number of vertical headers. Not the opposite. Change-Id: Icbac8581f344773822a2520cb986769bebb630c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* qdoc: Allow wildcards for excludefiles qdocconf variableTopi Reinio2016-01-223-5/+30
| | | | | | | | | | This commit allows the use of simple wildcards ('*' and '?') for excluding a set of files. A typical use case is to exclude all private header files with '*_p.h'. Task-number: QTBUG-50600 Change-Id: Ib50e9e85731d7506ea7299016f609e48ab3d277f Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* macdeployqt: clarify wording of -qmldir optionMitch Curtis2016-01-221-1/+1
| | | | | Change-Id: I8306799c0be90129a50412502a0142f33e5da4bd Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Android: strip also the extra libsBogDan Vatra2016-01-201-6/+6
| | | | | Change-Id: Ic415a84d1a585ca05b96c519c25479b1db3adf60 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* pixeltool: Stop depending on QtNetwork.Raphael Kubo da Costa2016-01-191-1/+1
| | | | | | | | There is nothing in the code using the QtNetwork module, so stop requiring it in the build system. Change-Id: I1f7bc89a9589dc2510f38a11fc4b4aeb69d662bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Doc: Fix issues in QDoc Manual documentationTopi Reinio2016-01-192-21/+18
| | | | | | | | | | | | | | | | This commit partially reverts 23fc55c4bbf3cf334ff33f1b7816c35fdc67fd93 - adding example directories from outside the module boundaries caused multiple warnings. Instead, copy-paste the required code snippet directly into the source documentation. Additionally, in qdoc.qdocconf, - Remove obsolete 'imagedirs' path - Remove obsolete dependencies - Fix filter attributes - Use up-to-date selectors for QHP Change-Id: Ic2836e1e2e1da6b4aebcd0250af25e2b40cce196 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* qtdiag: Output available platform theme names.Friedemann Kleint2016-01-191-3/+5
| | | | | | | | | Output QPlatformIntegration::themeNames() and align theme-related output. Task-number: QTBUG-49095 Change-Id: Ife16456b67eef97734399dc2f46112d6a9929c7f Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* windeployqt: Fix some CLANG warnings.Friedemann Kleint2016-01-183-20/+19
| | | | | | | | Remove C-style casts, fix integer conversion issues and remove unused variables. Change-Id: Ice842f0eab256c33d8c84b046118ce6930d19b70 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Android: copy the right gdbserver on arm64-v8aBogDan Vatra2016-01-151-1/+3
| | | | | | Task-number: QTBUG-50394 Change-Id: I5ea12a3b1c3ab53cd5308b32b0bb4b8075a705f2 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* lupdate: Handle translation comments in ternary expressionsMichael Hanselmann2016-01-153-1/+95
| | | | | | | | | | | When the condition in a ternary operator expression was anything more than a single identifier translation comments were not recognized for translations within the values. Re-enabling translator comment detection after the question mark fixes that. Task-number: QTBUG-48776 Change-Id: I83bb9efaab42c52fc05a39094060eb0a1fb76d94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Haiku: Make 3rdparty clucene library compileTobias Koenig2016-01-131-1/+1
| | | | | | | | Include the Haiku OS in the list of supported Unix systems Change-Id: I3096074c25f42595a47dde4457377fdf6857d3b3 Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* windeployqt: print WebEngine-related errors only onceJoerg Bornemann2016-01-121-4/+1
| | | | | | | Fix usage of errorMessage in deployWebEngineCore. Change-Id: Ifd2f6b97396171dfb94419d149acac0d71a0007b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* windeployqt: Adjust to changes in QtWebEngineJoerg Bornemann2016-01-121-4/+9
| | | | | | | | icudtl.dat and the pak files are now located in a sub-directory. Change-Id: I9f23e02c658f63a2a9a44ce39421671c6bcfd767 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* windeployqt: Fix QtWebEngineWidgets-based projectsJoerg Bornemann2016-01-121-4/+4
| | | | | | | | | | | We must deploy QtWebEngineProcess.exe and the resource files for every project that depends on QtWebEngineCore. Before, deployment took place for QtWebEngine-based projects only, i.e. projects using the WebEngine QML API. Change-Id: I8d5371dbdedc6766343a77755d2a91445decbdb3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* qdoc: Allow specifying a module name as QHP selectorTopi Reinio2016-01-112-6/+10
| | | | | | | | | | | | | | | Previously, there was no machanism to list the members of a specific C++/QML module in a table of contents subsection. This allows the above, with following syntax: qhp.project.subprojects.name.title = Qt FooBar Classes qhp.project.subprojects.name.indexTitle = Qt FooBar C++ Classes qhp.project.subprojects.name.selectors = module:QtFooBar Change-Id: I1547df3618c2daf8d24987c67e337e9dc99835b5 Task-number: QTBUG-50334 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-112-2/+2
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-2/+2
| |\ | | | | | | | | | Change-Id: Id32067f6a79990c0f734ebced8f17d931004e579
| | * Update the documentation URLs in man pages5.5Dmitry Shachnev2015-11-192-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I8d4e51391bb725e38cf0bceef28e90267a0da1b9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | windeployqt: Add support for --plugindirThiago Macieira2016-01-081-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the Qt plugins to be placed somewhere other than the root dir. The plugin dir structure is required if your qt.conf does not contain a PluginPath. Change-Id: I42e7ef1a481840699a8dffff14084a674886acca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | windeployqt: don't print the error message in deploy()Thiago Macieira2016-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | main() will do it Change-Id: I408dcb81ba654c929f25ffff142749fa6ff86796 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Fix dead URLsFrank Meerkoetter2016-01-081-7/+7
|/ / | | | | | | | | | | | | Link to doc.qt.io. Change-Id: I2fca0a457fad3564f0a2ce387482f922af38d4bc Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Fix broken link, dust off the \qmlsignal exampleFrank Meerkoetter2016-01-071-5/+4
| | | | | | | | | | | | | | | | This patch fixes a broken link (still pointing to Qt4.7) and also makes the example more consistent. Change-Id: I5705a367055013405c5015067567b830ab96201e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | lupdate: Support for C++11's "final" identifierMichael Hanselmann2016-01-053-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 introduced the "final" identifier which may appear immediately after the name in a class definition to specify that the class cannot be derived from. lupdate collects strings for translation and did not understand "final". Instead it would use "final" as the name of the class as there may be attributes before the class name and the last token before the colon character is used. [ChangeLog][lupdate] The C++11 identifier "final" is now skipped when determining the name of a class. Task-number: QTBUG-42735 Change-Id: I2adee9a188645622fc6916158ba2b48dde921383 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | lupdate: Merge class name extraction loopsMichael Hanselmann2016-01-051-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The extraction of class names was split over two separate loops. One for plain identifiers (e.g. “class Foo”) and another for qualified identifiers (e.g. “class Foo::Bar::Baz”). C++11 introduced the "final" identifier which may appear immediately after the name in a class definition. Detecting and skipping that identifier will only need to be in a single place when the two loops are merged. Change-Id: Id9ddc1ccd01cabcb4616d8c025b553c5be5c5807 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Parse the pid file for exit codeMaurice Kalinowski2016-01-052-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | 0ea3d630b1fd1fc21c65c43063792e4cbf0c2cdf in qtbase writes the exit code of the application into the pid file. This needs to be read from winrtrunner and then passed as exit code of winrtrunner itself. This allows to use winrtrunner for CI and other automated systems as the exit code of the application itself is passed. Task-number: QTBUG-38654 Change-Id: I28f915bf5c002078ba62546fea1ee014da5d0147 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | qdoc: Deduplicate adding a slash in both branches of an if/else.Edward Welbourne2016-01-041-3/+3
| | | | | | | | | | Change-Id: I5d3f78ad0c6e9a494485a2b5dca237c839d0932a Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | qdoc: Unify CodeNew and Code blocks in HTML generationEdward Welbourne2016-01-041-7/+4
| | | | | | | | | | | | | | As for CodeOld and CodeBad. Change-Id: I8c6fc90d0cafef3a77ec48c0a2961f6041e056fd Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | qdoc: Simplify two methods to use ones from the base.Edward Welbourne2016-01-041-2/+2
| | | | | | | | | | Change-Id: I3f2811f9de789c9df5e039e7c845d7d1626cb987 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | qdoc-doc: Combine code snippets into a single block.Edward Welbourne2016-01-041-10/+6
| | | | | | | | | | | | | | | | | | | | Having a \dots before the \code rendered the dots in a separate code display box, rather than as the start of the rest of the block. The same didn't happen at the end, but adjust it symmetrically anyway. Also fixed an over-escaped \snippet. Change-Id: I42253260745547c88c44a7ecaf937bb8303030a6 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | qdoc: Don't let a QML type be its own base typeMartin Smith2016-01-042-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | When qdoc runs without one or more of the index files for the modules it depends on, there was a chance it could set a QML type's base type to point to the QML type itself. This resulted in an infinite loop, which crashed qdoc with a bad alloc error. qdoc has now been changed so that it refuses to set a QML type's base type to itself. Change-Id: I08e8959ddb67b2d1f3b1bf44d9dc48624bafebfa Task-number: QTBUG-50163 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | qdoc-doc: Add some paths needed by qdoc-manual-markupcmds.qdocEdward Welbourne2016-01-041-2/+4
| | | | | | | | | | | | | | | | They're both in qtbase, but I'm hoping we can get away with assuming it's checked out alongside qttools. Change-Id: Ic9cde061f2065acf0a5199bf5974a3b17efe6e2e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | qdoc-doc: Adjust some wordings so they're actually true.Edward Welbourne2016-01-041-2/+2
| | | | | | | | | | | | | | | | | | They claimed all the formatting commands were for C++, despite \qml being for QML not C++ and many of the commands being *not only* for C++ but also for (at least) QML. Change-Id: I942f7b597d6abad364caf5d7eda340cbce8c272b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 01:46:23 +0000