summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-093-2/+20
| | | | | | | | | | 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>
* 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-266-84/+107
|\ | | | | | | Change-Id: I634e966c85d022b9656e8bb2c5279e17735eb381
| * Change license header of uitools to LGPLv5.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>
| * Add changes file for 5.8.0Jani Heikkinen2016-12-091-0/+41
| | | | | | | | | | Change-Id: I6468b30b6dca4276298e452811ac141677bd6120 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* | Update the tools' .plist filesFriedemann Kleint2017-01-255-26/+25
| | | | | | | | | | | | | | | | Change company name and domain, remove obsolete tags and bump the DTD/plist version. Change-Id: I3dd9e539f18e366049309a4ba204dd19e4a05a4d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Improve error message in QHelpProjectDataPrivate::readKeywords()Friedemann Kleint2017-01-241-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store name, id and ref attribute values in local variables to prevent duplicated string construction and map lookups and add a message function to format an error message containing file name and name. For example: Missing attribute in keyword at line 3349. becomes: qtbase/doc/qtcore/qtcore.qhp:3349: Missing attribute in <keyword name="Q_ENUM_NS">. Change-Id: Ia850ac1428471436b53e461a083b0ef8a8ba8bf6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Windows: Fix copyright and product version of Assistant/Designer/LinguistFriedemann Kleint2017-01-236-99/+24
| | | | | | | | | | | | | | Remove the .rc files and set the relevant qmake variables. Change-Id: I3b5972ec8a04000c7fbf311421379d81bce965b0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | move project file statements to canonical locationsOswald Buddenhagen2017-01-192-3/+3
| | | | | | | | | | | | | | | | load(qt_app) belongs at the end of the project file, while option(host_build) at the top. Change-Id: Icaa80e6436d84eee91f6ccf91051c139e80a0b64 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | avoid race condition in modular x-buildsOswald Buddenhagen2017-01-181-0/+10
| | | | | | | | | | | | | | | | | | the first load of toolchain.prf for the host needs to be serialized. qtattributionsscanner was chosen as the "anchor" because it's always built and it's small (so the serialization doesn't hurt too much). Change-Id: Iae1446ff92f1189d522fe85ab3e645cdc2c5a56b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qdoc: Implement C++11 'override' specifier supportRainer Keller2017-01-128-4/+23
| | | | | | | | | | | | | | Change-Id: Iad837dbdaf492eff77ced4d93dc05095e1d89400 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Michael Winkelmann <Michael.winkelmann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Doc: QDoc manual: Document \badcodeTopi Reinio2017-01-052-4/+22
| | | | | | | | | | | | Change-Id: Iffbf809261a2ac572aa83ca5aaddb3d6258221ac Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: QDoc manual: clean up command indexTopi Reinio2017-01-053-20/+21
| | | | | | | | | | | | | | | | | | | | | | Fix typos and formatting, remove unused \span commands and remarks of items introduced 5 years ago as being 'New'. Also list the \qml command in the command index, and remove a couple of obsolete statements. Change-Id: Iaa7a81889f30e08ea8299bc0e1848c8472efa7e1 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Be more explicit about linguist's module dependenciesUlf Hermann2017-01-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The conditional addition of printsupport made it seem like linguist was intended to compile also without printsupport. However, QPrintDialog is extensively used, with no #ifdef guards whatsoever. Therefore, printsupport is apparently not optional. It doesn't make a lot of sense to build desktop tools with reduced Qt configurations. Doing so would clutter the code with #ifdefs for very little benefit. Change-Id: I815a0cfa90da6c302e894e0c10c18184128123fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | Change-Id: I0c3dbd55a47eb35ca6ec5487768629390616d5cc
* | windeployqt: Use relative path output by qmlimportscannerFriedemann Kleint2017-01-022-29/+8
| | | | | | | | | | | | | | | | | | | | Remove logic to strip version number off QML paths for determining the target directory. Task-number: QTBUG-57494 Task-number: QTBUG-52556 Change-Id: I605d8d2a27be20b779aa94feacd7bc3411237ddf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix licenses in Qt Designer's XSLT style sheetsFriedemann Kleint2016-12-212-28/+40
| | | | | | | | | | Change-Id: Idc8cafff454226e58508f93c6b6a2f4d9bd60b95 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QCLuceneDocument: use the right delete operatorGiuseppe D'Angelo2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | "values" is allocated via operator new[], it needs to be deleted via operator delete[]. Change-Id: I58d072f1b55958031112e11c995d13407ef513d1 Coverity-Id: 21729 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.8.0' into 5.8Simon Hausmann2016-12-081-3/+28
|\| | | | | | | Change-Id: Ifc9140cd8798a1cdd59dabd18c223d33a612fa78
| * Fix build after changes to QtQMLJoerg Bornemann2016-12-021-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | This patch supports building against declarative before and after commit 6ed23b91b949b7edaf96cdb0f2bba7b21a02de89. A template specialization is used instead of a function overload to avoid the compiler warning about unused functions and aborting the build. This can be simplified once qt5.git has been updated with declarative to contain the aforementioned commit. Change-Id: I9a1afdbaa70b6478bc5f51a833913fdc6cea1858 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | fix numerus rules for armenianOswald Buddenhagen2016-12-061-1/+2
| | | | | | | | | | | | | | | | | | | | unicode says they language uses french style plurals (0 & 1, and everything else). Task-number: QTBUG-57399 Change-Id: I2ebb80bbed9f055b7908e43134c086f7b34ce885 Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* | fix tatar plural rulesOswald Buddenhagen2016-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | numerous sources indicate that this language does, indeed, have only one numerus form. Task-number: QTBUG-57398 Change-Id: Ifd871dc13820b96510b9eb9615c346cbc37a5def Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* | qdoc/HtmlGenerator::highlightedCode(): Use QString::startsWith()Friedemann Kleint2016-11-301-1/+1
| | | | | | | | | | | | | | | | Previously, QString::at(0) was used without length check, which can potentially crash. Change-Id: I25824741dc746da1bf013d98a700ffa7b92cb206 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | winrtrunner: Reset all ComPtr instances before CoUninitialize()Friedemann Kleint2016-11-291-0/+2
|/ | | | | | | | Ensure all pointers are reset in the destruction sequence. Otherwise, a crash occurs when the application fails to start. Change-Id: I921c96bd5fdb82dcbe1602bbffeea22d2852c2cf Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* qtattributionscanner: Support optional QtParts propertyKai Koehne2016-11-288-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd like to differentiate between code that ends up in the Qt libraries or plugins, or code that only is added to examples, tests, or (host) tools. This can now be specified with the JSON property 'QtParts'. If 'QtParts' does not contain 'libs', the page will not show up in the list of attributions generated by module with e.g. \generatelist{groupsbymodule attributions-qtcore} nor in the global list generated by \generatelist annotatedattributions Instead, third party code in examples or tests can now be documented separately using e.g. \generatelist{groupsbymodule attributions-examples} and \annotatedlist attributions-examples Change-Id: Iba72f76b63e4435af54a61b7b4a2cf4617746ba6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-264-20/+24
|\ | | | | | | Change-Id: I7d084d8f51a728f9a2521f89fd57ec604544169a
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-243-20/+21
| |\ | | | | | | | | | Change-Id: Ia29a9aa855aa3bfab1a26fc3671b6c5436c176c1
| | * Qt Designer: Remove unused variableFriedemann Kleint2016-11-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: widgetbox\widgetboxtreewidget.cpp:70:20: warning: 'qtLogoC' defined but not used [-Wunused-variable] static const char *qtLogoC = "qtlogo.png"; Amends change 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9. Change-Id: I4908a067c654d706f24d0afafd99142241ad3f69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * pixeltool: Check whether initial geometry is applicableFriedemann Kleint2016-11-081-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing primary screens of multi-monitor-setups on Windows, out-of-screen positions might be saved which make it impossible to bring the tool back and also cause crashes when no screen is found for grabbbing. Check the saved position when reading the settings and check if a screen can be obtained for grabbing. Change-Id: I69ec677e144306290a4ee7a3e84f87dd600ff086 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-13/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I030c3c28510163bc7c35f82808b3882e68e51857 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-244-29/+74
| |\ \ | | | | | | | | | | | | Change-Id: Ibaac0fc6ca0ec7c911793451f8d80dbe2758c41c
| | * | Fix a leak and a crash in designerv5.7.1Jarek Kobus2016-11-033-29/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change downports the 56ac0c12ab5e7269e16bcc1248e4241302d91d09 change to the 5.7.1 branch in order to have a chance for releasing Qt Creator 4.2 with a fix. The crash doesn't appear in the standalone Designer, it only appears in the Designer plugin of Qt Creator during reload. There is no other way to fix that crash outside of Qt. Task-number: QTCREATORBUG-17150 Change-Id: Ide521677a1526d3de862d0d8e283531a67b2a7a8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 56ac0c12ab5e7269e16bcc1248e4241302d91d09)
| | * | Fix assert when instantiating QWebEngineViewKai Koehne2016-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebEngineView requires that OpenGL context sharing is enabled. This needs to happen before the first OpenGL context is created. In QtWebEngine we don't do this automatically for dynamic builds anymore (commit e2541ebdfadea0fe43baac748cfa9e07f3b57215) Change-Id: I07e10cf6986650f1e2fdebdc04fb5d65774f393a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Fix a crash on Designer exitJarek Kobus2016-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the destructor of FormWindow itself has finished, it starts destructing its fields. One of them is an undo stack. Unfortunately, the destructor of QUndoStack emits signals. One of its signals is being received in QDesignerFormWindow::updateChanged(). The QDesignerFormWindow keeps a QPointer<FormWindow> m_editor which we are currently destructing. The destructor of FormWindow finished, but the destructor of its base QObject didn't run yet, so all QPointer instances pointing to it are not nulled yet. Inside the updateChanged() we ensure that m_editor is still alive, however this check is wrong in Qt5 times. The QPointer will be nulled when the destructor of base QObject finishes, so we read that m_editor is valid, while it is in the middle of destruction. Then we call some method on it which leads to the crash. The current fix disconnects the undo stack's signals prior to destuction. It also removes the undo stack from the undo group. Task-number: QTBUG-57201 Change-Id: I753b5c8cae2b630d7cdec13b0dfe325d16726e82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | qtattributionscanner: Print (and link to) upstream version in qdoc outputKai Koehne2016-11-181-2/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f50456cee9a11e41e200a097ba2152d94ee273a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | qdoc: Correctly check for feature xmlstreamwriterFriedemann Kleint2016-11-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: qttools/src/qdoc/qdoc.pro:2: Cannot find feature qfeatures Change-Id: I0aac9873b4f9c1b8d30bd38b2b1f356b21feffe9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Fix sorting of generatelistKai Koehne2016-11-161-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the attributions where sorted first for target names (Node::name()), not by the text displayed. Fix this by first doing comparisons based on fullTitle. Also fix the same logic for function lists. Change-Id: Id11f96355665b1aae0499ce2dd0d876d698b10c9 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-0835-141/+421
|\| | | | | | | | | | | | | | | Change-Id: Ib403ca6ac5edf4c75e7fbdcd467601bdfe348e6d
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0435-141/+421
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I4ee208f69bed72c480c636cb18f22fd88c02d1e5
| | * macOS: Handle -qtlibinfix correctly in macdeployqtAndy Shaw2016-10-261-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configured with -qtlibinfix then it will insert the specified setting inside the framework names. Therefore QtCore.framework can be called QtCoreLibInfix.framework. This means that we have to account for this in macdeployqt when determining which plugins should be deployed. Change-Id: I30fc7434fa87d1b41c2cacfbc9f76d4ce5491329 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| | * lupdate: Add qrc resource file supportTakumi ASAKI2016-10-2513-57/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lupdate parses qrc files specified by the RESOURCES qmake variable or by command line options, and adds files in them as source files. [ChangeLog][lupdate] Added qrc resource file support Task-number: QTBUG-53206 Change-Id: Id7f952487ab11e062db9c5a419fb2ee3c4716740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * prevent .prf files from postponing work to build passesOswald Buddenhagen2016-10-254-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as lupdate doesn't execute any. this increases the chance that we will get a complete picture of the project. this is preparation for lupdate interpreting .qrc files. Task-number: QTBUG-53206 Change-Id: I5e10b44637d527799f55c578a99076eb4750f131 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * fix test execution in dirs with spacesOswald Buddenhagen2016-10-252-6/+6
| | | | | | | | | | | | | | | Change-Id: Ib99cf27f50f32eb23d278f5b9a9c279d10da4ece Reviewed-by: Jake Petroules <jake.petroules@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 08:53:39 +0000