summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* windeployqt: Unconditionally deploy all files of Quick Controls 1v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Friedemann Kleint2017-05-221-11/+0
| | | | | | | | | | The files are added to resource files only in the case of static builds; so, for Windows UWP 64, for which QML caching is disabled, they were missing. Task-number: QTBUG-60536 Change-Id: Idb795f71441ab1bfbc1cdbc53a322ee9e86e54bc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Move the linksForKeyword from QHelpModelIndex to QHelpEngineCoreJarek Kobus2017-05-093-7/+19
| | | | | | | | Obsolete it inside QHelpModelIndex. Change-Id: I11f1e67c6eac6e6790a7c73d5850f5b415214db1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Revert "windeployqt: Remove deployment of libglesv2 and libegl"v5.9.0-beta4Friedemann Kleint2017-05-051-4/+19
| | | | | | | | | | | Bring back the autodetection of ANGLE as the naming now depends on configure switches. This reverts commit fc8b7d36291611aebdc344f2e26a992da0003bbc. Task-number: QTBUG-60373 Change-Id: I14826cd1730fddb203e9a7c98b76d7def7388d9c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* disarm webkit use in assistantOswald Buddenhagen2017-05-041-1/+2
| | | | | | | | that configuration is currently broken. Change-Id: Ia35ba4d0b90687db26a0bb6f664df01e1ed1490a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix licensingJani Heikkinen2017-05-0311-132/+165
| | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one - Switch old LGPL3 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: I36a5b5b823cede544f43ac8349b5db27f8df6abc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* winrtrunner: Switch default target from phone to local deploymentOliver Wolff2017-05-031-12/+12
| | | | | | | | | | | Phone is no longer the main use case for winrt applications, so that local deployment is a reasonable default. Changing the default to local deployment means, that calling winrtrunner witout "--profile" or "--device" will run the given executable locally. This new behavior will help during the first phase of bringing winrt autotests into CI. Change-Id: Id67e1ddd4e994c57402e60e5ba2db79f9a25653f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Refactor help libJarek Kobus2017-05-0226-417/+304
| | | | | | | | | | Fix const correctness. Use default member initializers. Fix some coding style issues. Change-Id: Ib89a2840648dcacc518cda4eb0ffce97ee8444cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Refactor connect to use Qt5 styleJarek Kobus2017-05-0247-534/+602
| | | | | | | Change-Id: I9fed1b82d5afd0458b772475d303d2c0179ac73e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix winrtrunner for VS 2017Oliver Wolff2017-05-022-18/+18
| | | | | | | As we only support VS 2015+ the conditions can be dropped. Change-Id: Idd1763265d63e65dddbec810ee7984fcfa7b75cc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Refactor some APIJarek Kobus2017-05-0215-194/+255
| | | | | | | | Deprecate old sfuff. Adjust documentation accordingly. Change-Id: I976823b29cb05dcf5880cb97f17408f85dae2e1b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix setting a source model in BookmarkFilterModelJarek Kobus2017-05-021-18/+18
| | | | | | | | | Pass newly set model to the QAbstractProxyModel::setSourceModel() call, instead of the old model. Make sure the new model is not null. Change-Id: I149b3c6defd070eb7f6f6fd068639ebf784dfcb9 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* qdoc: Stop warning about undocumented parameters of function overloadsTopi Reinio2017-04-251-1/+1
| | | | | | | | | | | There are cases where the parameters of an overloaded function differ enough to have everything documented, but also cases where most of them are already documented in the original, or differ only by type. Therefore, leave it up to the writer to decide what needs to be documented. Change-Id: Ibe8f520f7f22bf94c74eb91546e610e085f3d635 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Write debugger command to assetsBogDan Vatra2017-04-251-0/+13
| | | | | | Change-Id: I0a8e44106aa3ada8267438c173c2d8dfe9f511e6 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* windeployqt: Adapt to QML cache filesv5.9.0-beta3Friedemann Kleint2017-04-211-4/+19
| | | | | | | | | | Extend the file filters to match cache files and deploy complete directories for Quick Controls 1 if cache files are detected. Task-number: QTBUG-60258 Change-Id: I903789b1cbca0e747fa4198230b3b917b68ab27b Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix build without features.domv5.9.0-beta2Tasuku Suzuki2017-04-071-1/+2
| | | | | Change-Id: I2b8fd30f47baba6a0648ff5ccc2e15138a50c712 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix warning about uninitialized variablesThiago Macieira2017-04-041-1/+3
| | | | | | | | | | | If locateWidget returns false, the variables aren't initialized. So initialize them with some values. shared/layout.cpp:967:33: warning: ‘colspan’ may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: I27b55fdf514247549455fffd14b1ae64e242a38e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove unused functionsThiago Macieira2017-04-043-36/+0
| | | | | | | | | | | | | | | | Found by Clang 5: layout.cpp:608:26: warning: unused function 'operator<<' [-Wunused-function] Found by GCC 6: layout.cpp:660:8: warning: ‘QDebug qdesigner_internal::{anonymous}::Grid::debug(QDebug) const’ defined but not used [-Wunused-function] qlayout_widget.cpp:103:7: warning: ‘QRect {anonymous}::gridItemInfo(const QFormLayout*, int)’ defined but not used [-Wunused-function] Found by ICC 17: signalslot_utils.cpp(169): warning #177: function "<unnamed>::ReverseClassesMemberIterator::operator++(int)" was declared but never referenced Change-Id: I27b55fdf514247549455fffd14b17fd785680415 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix warning about using a non-literal in qWarningThiago Macieira2017-04-041-1/+1
| | | | | | | | | | And in the process, fix the encoding. Since this can be translated, it's not restricted to US-ASCII. qhelpsearchindexwriter_default.cpp:79:18: warning: format string is not a string literal (potentially insecure) [-Wformat-security] Change-Id: I27b55fdf514247549455fffd14b17fb6da0617d0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Fix hang in PropertySheetIconValue::operator<()v5.9.0-beta1Friedemann Kleint2017-03-311-0/+2
| | | | | | | | | Add missing iterator increments, amending change 4ca6d6bfb0071aa03744e292f688ef69772a5a47. Task-number: QTBUG-59841 Change-Id: I89d293b813abefc5441edfc0dfd5a4cca4122af0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix build without QProcess and QLibrary supportKimmo Ollila2017-03-294-2/+11
| | | | | Change-Id: Ifc36253a7c3f5bafcfd6febefcdba3ec51dd4a7d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* macdeployqt: Fix code signingMorten Johan Sørvig2017-03-291-8/+1
| | | | | | | | | | | | | | | We were attempting to code sign bundle data files, which the logic in codesignBundle() is not designed to handle. This caused errors when trying to run otool on on .plist files etc. Remove the “catch all” code path that was added in commit 7d2b0968 and restrict codesignBundle() to work on executables. Task-number: QTBUG-54380 Change-Id: I9192d2876a0031a2feb19053c404196962ac22d4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump copyright yearFriedemann Kleint2017-03-276-6/+6
| | | | | | Task-number: QTBUG-59648 Change-Id: I4aba86e684ca6073228e556000599781303b74bd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-273-20/+9
|\ | | | | | | Change-Id: I73fad6fed560b8df8382cb9c17fe295a74ef3553
| * Update gradle folder5.8BogDan Vatra2017-03-241-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-59237 Change-Id: Ib78bb16b2d0e154b47056be91780085e58c1c642 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Designer: Fix Grid::empty()Marc Mutz2017-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | It returned whether it was _not_ empty. Found by GCC 7: qt5/qttools/src/designer/src/lib/shared/layout.cpp:600:42: warning: ‘*’ in boolean context, suggest ‘&&’ instead [-Wint-in-bool-context] bool empty() const { return m_nrows * m_ncols; } ~~~~~~~~^~~~~~~~~ Inverted the result and fixed up the only caller. Change-Id: I788eb2c45b382534275fbf0cca1bb27897a68a49 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Use gradle from Qt locationBogDan Vatra2017-03-201-16/+1
| | | | | | | | | | | | | | | | Because now we control everything we don't need to update Gradle's urls Task-number: QTBUG-59237 Change-Id: Idfcd20a6d4bdd2b269bb5675ad9938bf403b67c5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix lupdate to handle \u escapesEdward Welbourne2017-03-091-2/+6
| | | | | | | | | | | | | | | | | | | | It treated \u as u, which isn't correct. Instead, read the number following and convert, via QChar, to UTF-8 encoding in the byte array (that'll later be .fromUtf8()ed). Added a simple test-case. Task-number: QTBUG-35164 Change-Id: Ib23cc5e5fb98e6cb8715b4018545e40a40e271d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | winrtrunner: Fix waiting for local package (un-)installationOliver Wolff2017-03-241-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Debugging did not work on some machines as the waiting loop used in qlocalappxengine was not implemented properly. Instead of relying on an undocumented return value of GetResults we register a callback that is triggered when the deployment operation is finished and trigger an event inside that callback in order to avoid a busy loop. Task-number: QTCREATORBUG-17907 Change-Id: I0bd6535ef0e333ec27b9f339e0c786a63d3b9d07 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Use join(QChar), join(QLatin1String) where applicableMarc Mutz2017-03-2314-18/+18
| | | | | | | | | | | | | | | | They're faster/expand to less code. Change-Id: I4d79abb870c7b49784be17dc174ab68d98b1a75d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | androiddeployqt: eradicate Q_FOREACHMarc Mutz2017-03-232-58/+64
| | | | | | | | | | | | | | | | and mark the tool as Q_FOREACH-free. Change-Id: I1f9cd6111cde26a8a09b401207d80e5bf7dad833 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | QHash: use the public functions to set the global hash seedThiago Macieira2017-03-151-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-47566 Change-Id: I4a7dc1fe14154695b968fffd14abd2e3189c6ad2 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | windeployqt: Remove the Qt5CLucene moduleFriedemann Kleint2017-03-131-52/+47
| | | | | | | | | | | | | | Change d116ac573d80b6fdfdea4a56b7ae44f84e0ba6ad removed the module. Change-Id: Id27baf16f5c908283c0d28a28eb5e8f0b8b5dc71 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Remove the note about the clucene licenseJarek Kobus2017-03-131-4/+0
| | | | | | | | | | Change-Id: I6fdb7f4d19c69bc002549ab3e9dc25892ac079be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix build with QWebView as parent class for the help viewerSimon Hausmann2017-03-111-5/+7
| | | | | | | | | | | | | | | | | | | | Using override with functions that are not virtual in the base causes build errors such as error: ‘void HelpViewer::setSource(const QUrl&)’ marked override, but does not override Change-Id: Ibdff5cdf199bb31810bbebf97d8f5ab2e6c777bf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove uses of QString::nullMarc Mutz2017-03-101-1/+1
| | | | | | | | | | | | | | It's going to be deprecated. Change-Id: Ife600e92f4eb3ec95538b55c877e7a1f498e905c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-1014-167/+154
|\ \ | |/ | | | | Change-Id: I550cd94029cb515a487ccbf700dfc083101ed945
| * Drop some unused includesUlf Hermann2017-03-062-2/+0
| | | | | | | | | | Change-Id: Ida9409117c9fd4a022671fadb77ba96734118861 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix emission of QDesignerFormWindowInterface::changed()Friedemann Kleint2017-02-022-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The tools depend on QDesignerFormWindowInterface::changed() to update their views. Connect the signal to QUndoStack::indexChanged() instead of QUndoStack::cleanChanged() as was before in removed class QDesignerUndoStack. In addition, emit changed when the QUndoStack emits cleanChanged(false). Task-number: QTBUG-58584 Change-Id: Idb7dc630952bb9d79695cb914676f1d9657cc17b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-265-84/+66
| |\ | | | | | | | | | Change-Id: I634e966c85d022b9656e8bb2c5279e17735eb381
| | * Change license header of uitools to LGPLv5.8.05.8.0Kai Koehne2017-01-023-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | uitools is a static library that user applications can link to, and should be under LGPLv3. Change-Id: I3a08162c0d029fc52cf13432907e297063d7a6ae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Doc: Edit the Qt Help System overviewv5.8.0-rc1Leena Miettinen2016-12-141-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | ... to fix typos, punctuation, articles, QDoc commands, and Qt writing style. Change-Id: I35334c8c108d7ab15bfe1a97e6ececb8cd4c8acd Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * Remove license acknowledgment for removed codeKai Koehne2016-12-091-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code in question was part of the 'Qt Designer Easteregg' removed ages ago. Change-Id: I80fc6e936dfa8f9ae3ada4a965efde11dea32d89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Fix whitespace and indentation of the tools' .plist filesFriedemann Kleint2017-01-255-80/+78
| | | | | | | | | | | | | | | | | | | | | | | | Expand tabs and indent by 4. Change-Id: I2e5766625bdb37462250a4207119e499a78c3202 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Remove clucene sourcesJarek Kobus2017-03-09278-59612/+3
| | | | | | | | | | | | | | | Change-Id: I636e5c5d64955af60614684d71d220cda34758d7 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Implement snippet functionality for search resultsJarek Kobus2017-03-0910-178/+155
| | | | | | | | | | | | | | | | | | Change-Id: Idaeddb90ae39963e9b92912289f1ecbccd3669e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Use sqlite's FTS5 for searchJarek Kobus2017-03-0825-3018/+634
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change drops the usage of clucene library. We store the plain text version of html content of all the documentation inside the sqlite database. We transform the html into plain text using QTextDocumentFragment::fromHtml() and QTextDocumentFragment::toPlainText() methods, what causes the indexing a bit slower, however it makes the indexing much more accurate (try e.g. searching for [charset] or ["utf-8"] keywords) and enables showing the highlight (next patch). Dropped usage of local socket in order to detect if the other assistant instance is running. Obsoleted the -rebuild-search-index cmd line option. Comparison for the whole documentation of Qt: Disk usage for index: ~15 MB (5.8), ~85 MB (current) Indexing time: ~40 s (5.8), ~60 s (current). Change-Id: I89f2fa9efddc354f86e5ed0f5b4f5e2790057121 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Cleanup QRegExp includesSamuel Gaist2017-03-0713-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the missing QRegExp includes in prevision of the qtbase include cleanup. Change-Id: I25b66ac2cf71bdfa74612aa9dcd35ae9d0584f17 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | windeployqt: Fix deployment of the Qt 3D renderer pluginsFriedemann Kleint2017-03-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the library names (Qt53DRenderer -> Qt53DRender, Qt53DQuickRenderer -> Qt53DQuickRender) and add the renderplugins directory. Amends 642bff09076a95b0eede67216a13b0080a2ce851. Task-number: QTBUG-59325 Change-Id: I570f275061dddac5407766c0f144d329ef136c5d Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | androiddeployqt: don't include plugins that are not necessaryOleg Yadrov2017-03-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds simple filtering of file names received from findFilesRecursively function. If any plugins located in subfolders are actually used, they will be included to qmlimportscanner output and hence processed on the next iterations of outer loop. Task-number: QTBUG-46451 Change-Id: I0243cba41a616652ff356a98baaf708aa0b6a3f7 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Qt Designer: Fix Coverity Scan warning about missing return checkFriedemann Kleint2017-02-281-3/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-59195 Coverity-Id: 21591 Change-Id: I72f486cfe9b7dcb346ffce122d0354ab61394047 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
View Lorry Controller Status