summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix linking libclang with mingw when cross-compilingSimon Hausmann2018-08-221-3/+6
| | | | | | | | | | | | | | | | | | | | | | Commit 4ec82667f632992e827299c96d3bfd2b221a029b moved the mingw: CLANG_LIBS += -ldl condition from a option(host_build) .pro file to qt_find_clang.prf which is evaluated in target scope. That means when cross-compiling, we can't use mingw anymore as a way to detect the host compiler. Instead, rely on MinGW being the only alternative to MSVC that we support as a host compiler when cross-compiling. The msvc part is dealt with earlier in the file. Also cleaned up the LLVM_INSTALL_DIR determination that suffers from the same symptom (commit ac6de68fe7d4fef251c101ef25812fe2198925f8), where the msvc bit needs a proper scope for the else to work correctly. Task-number: QTBUG-69793 Change-Id: Id544c7929b79fc3c8763d50e0bac4a3a689ade60 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix linking of qdoc against libclang when cross-compiling to QNX/AndroidSimon Hausmann2018-08-221-2/+9
| | | | | | | | | | | | | | | | When cross-compiling to QNX, qt_find_clang.prf is evaluated against the target configuration, so the check for "mingw" to select the right LLVM_INSTALL_DIR variant does not work as that's the host configuration. So instead we must formulate the conditions differently and rely on the fact that we are either using MSVC where the same compiler is used for host and target architecture (even if the architectures differ) or otherwise minwg is the host compiler (while target may be something else). Task-number: QTBUG-69793 Change-Id: I31acc127c94e0a8570242d1c8ea0db873f9fd253 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Qt Designer: Fix crash when reloading resourcesFriedemann Kleint2018-08-211-0/+1
| | | | | | | | | Initialize DesignerPropertyManager::m_object in the constructor Task-number: QTCREATORBUG-18342 Change-Id: I7acc7c12855b4775544a85fd000089cdcd6277af Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Fix typo in linguist manualPaul Wicking2018-08-081-2/+2
| | | | | | | Task-number: QTBUG-51975 Change-Id: Ie7069db3e35a81ea1f44d1bf4c0a2ffd6f3215aa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: Update Installing clang for QDoc pagePaul Wicking2018-08-021-12/+15
| | | | | | | | | | | | | * Remove temporal phrases (e.g. 'at this time', 'at the time of writing') * Remove references to Qt Creator's libclang and questions about static/ dynamic linking in the text. * Describe LLVM and LLVM_INSTALL_DIR environment variable as procedural prerequisites for building QDoc from source. Task-number: QTBUG-69707 Change-Id: I688714b37721ed1180d500674ca4b271ed257799 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: Ide4fd857663ab3ca36fa3eb2f65e87e0789487c7
* Doc: Add information about locale file name conventionPaul Wicking2018-07-261-6/+17
| | | | | | | | | * Add details from QLocale::QLocale(const QString &name). These have been rewritten to target a less technical audience. Task-number: QTBUG-69556 Change-Id: Ibf08b0b5d6075c4f7ccaf19a3f44bf3ba90433dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Linguist: Fix detection of language by filenameKai Koehne2018-07-261-2/+2
| | | | | Change-Id: I31c3b259b4ab34c7b43bb08effbc28f4d4f1655f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Make the "Copyright" field in attribution files optionalNicolas Ettlin2018-07-242-4/+0
| | | | | | | | | | | | Currently, the "Copyright" field in copyright attribution files is mandatory. However, this obligation should be lifted so we could later use README.chromium files with the qtattributionscanner tool (these files do not contain a Copyright field ; in these cases, the copyright owners can be found in the license file's body). Change-Id: I569f8cd5d3f20fc85e5fcb873601053327841dda Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Doc: Exclude parts of QtUiTools documentation based on the qdoc configVenugopal Shivashankar2018-07-242-0/+4
| | | | | Change-Id: I4b0257108498efa2e10a1c4fa5deda3acb74187f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QDoc: Check aggregates with Node::nodeNameLessThan to improve sortingPaul Wicking2018-07-181-11/+3
| | | | | | | | | | | | | | Certain corner cases were not covered by the current implementation, causing the sort to fail. This change aims to make QDoc capable of sorting all nodes derived from aggregate, because an aggregate can be expected to have a user visible title that can be used to sort content alphabetically. Impressively, this has been working for most lists of classes in the generated docs, just not all. Task-number: QTBUG-67530 Change-Id: I5b5b19011c6a1e561894f8155c971da60aff7e2f Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* Qt Designer: Fix Qt Creator crashes on reloading malformed UI filesFriedemann Kleint2018-07-106-87/+137
| | | | | | | | | | | | Extract the functionality to read the DomUI with version check to QFormBuilderExtra so that the reading can be split into DomUI and widget creation. In FormWindow, check the success of the DomUI creation before modifying Qt Designer's internal state. Task-number: QTCREATORBUG-20742 Change-Id: I095f80e90966eba67d8994cd68e83c3e11aa0ee9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* windeployqt: document verbosity levelsMitch Curtis2018-07-051-1/+1
| | | | | | | | | Not knowing what to set them to makes them kinda useless. They are 0 to 2, based on the source code. Change-Id: I43b48614d99d26a9508326755b365f86aa087831 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* fix installation of cmake config for linguist in clean buildsOswald Buddenhagen2018-07-041-1/+1
| | | | | | | | ... by using the right CONFIG flag. Change-Id: I24eab0454a45f2de1a023c357334330adaf0e7e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Prospective fix for linking qdoc against libclang with MinGWSimon Hausmann2018-07-022-18/+12
| | | | | | | | | | | | | | Pick the libclang installation from MinGW or MSVC specific directories on Windows for static linkage, as they cannot be mixed. And it turn out that we need the explicit static library linkage for MinGW as well (or just not for MSVC, as I guess the .lib there is self-contained). Task-number: QTBUG-68064 Change-Id: Ie20c8910e0a2776940dcd78a1b28e36f5ce30947 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* windeployqt: Fix Elf parserFriedemann Kleint2018-06-271-0/+2
| | | | | | | | | | The code did not correctly step over sections other than the DT_NEEDED it was looking for. Fix this in case plans for a universal deployment tool are revived. Task-number: QTBUG-69151 Change-Id: Ia2075f15b9cedef35ebc39bba33260ce6cc98615 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* qdoc: Fix link generation code for \brief statementsTopi Reinio2018-06-221-7/+8
| | | | | | | | | | There was a mistake in the previous commit (36914fc8) that caused incomplete <a href=""> tags to be generated for \brief statements. Change-Id: Ia93033c1d530468f94c3b5d45039b07f2af3e027 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Remove 'QML' specifier from generated type stringsTopi Reinio2018-06-221-7/+5
| | | | | | | | | | | | | | | | | | | \since command for QML properties generates a string 'This QML property was introduced in Qt x.y' This commit drops the use of QML from above sentence. There's little need to repeat the string 'QML' as it appears on QML reference page already - by keeping the type strings simple, the generated sentences make more sense also when commands like \qmlproperty are used in documenting a non-QML interface, as is the case with Qbs. Task-number: QBS-1294 Change-Id: I9c8488331b3fb279f80aeb390b00e48b12d79e19 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qdoc: Prevent duplicated example entries in annotated listTopi Reinio2018-06-222-4/+10
| | | | | | | | | | | | | | | QMultiMap where the example nodes are collected allows duplicate (key, value) pairs. QDoc analyzes the tree multiple times and we may end up with multiple copies of the same entry in an annotated list for examples. Also when listing the examples, use navigation.landingtitle as the (module) section title, with navigation.landingpage as fallback. This prevents html file names as section titles which look bad. Task-number: QTBUG-69079 Change-Id: I24199137856d9775078b7780e5b52642ec5acbbc Reviewed-by: Martin Smith <martin.smith@qt.io>
* Remove dead test - compilerwarningsJarek Kobus2018-06-221-39/+0
| | | | | | | A follow-up of 9d078c8f147ea875e862360b0d7480201fbbcff7 in qtqa repo. Change-Id: I25b888e507d01dda8c059ea85b2902bfa8337a61 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Move androiddeployqt to qtbaseJan Arve Sæther2018-06-213-2928/+0
| | | | | | | | | androiddeploytqt is the only official way of deploying applications to the device, so it is therefore part of the "platform". It therefore needs to live in qtbase. Change-Id: I8dbff46ea77454aa1d5f41d52e17b52fcc108f2b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* windeployqt: Add support for Qt3DExtras moduleAndy Shaw2018-06-191-1/+3
| | | | | Change-Id: Ie09a99f5d3c560768f6d284f0a8c7569aac11ea8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
|\ | | | | | | Change-Id: I1e92253db3beafc7f91259604ff8d4cf34cc7cc1
| * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-091-0/+24
| | | | | | | | | | Change-Id: I91b46ebc6a7ce1e3596cab30e8c3cc1b21001ff5 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Doc: Add trailing dot in QDoc examplesPaul Wicking2018-06-191-2/+2
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I7fecb2970cbf47bbc7eca8b5ecf817773cd7fd67 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Add missing dotsPaul Wicking2018-06-194-4/+4
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I32122f9c771b12f1ea4cb3c8e405c30bf2bf4d41 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove repeated Qt moduleJesus Fernandez2018-06-131-1/+1
|/ | | | | Change-Id: I6efcb854d160a2ab5e6fd053546f426f454c9622 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add binary compatibility files for 5.11 for QtToolsMilla Pohjanheimo2018-06-053-0/+60554
| | | | | | | | Files for bic test added. Change-Id: I4e395b0b351a8f569e28255a5a507fb391d041a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* qdoc: Fix issues with processing of \brief statementsTopi Reinio2018-06-052-5/+12
| | | | | | | | | | | | - Add \brief statements to example documentation pages, but without the 'More...' link. - Check whether a \brief ends in a full stop. If it doesn't, add one and generate a warning. Task-number: QTBUG-60623 Change-Id: Ic1287ab173b7e46573d928fd6e1df8514f5f881d Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | Change-Id: Ic531808fd1d9443ea3ed878fae7449f593c58418 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit c9eeabc7a7f83eb5603cedf7336f50e089d025af) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+34
| | | | | | | | Change-Id: I3309b44d998fac9f61f0f09d061262bf6053209d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 95c8ac8f45163b4cea31514b0f47285396b499ed) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* qtattributionsscanner: Make QDocModule, QtUsage entries optionalKai Koehne2018-06-012-6/+1
| | | | | | | | | | | For Qt modules these should really be filled, but they might not make sense in other contexts, like Qt for Python. Therefore make them optional. http://quips-qt-io.herokuapp.com/quip-0007.html should be adapted, too. Change-Id: Ic4837052f29df21291c4ffcde175e7ff0946d46a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Iaec0d2b85f0dddef7513d4dfe57cc2a963233948
* Qt Designer: Fix crash when morphing widgets with buddiesFriedemann Kleint2018-05-281-0/+2
| | | | | | | | | | Bail out of PropertyEditor::setObject() when no form window can be found for the current widget, which can happen when setting the buddy property in morph macro sequences. Task-number: QTBUG-68507 Change-Id: I61955121d57e1c18e2ccf93d63e51d2df24f0827 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Flush wcout before exiting the appLars Knoll2018-05-241-0/+1
| | | | | | | | | Apparently not flushing caused the output to be truncated on some windows machines when redirecting to a file. Task-number: QTBUG-67860 Change-Id: I82a49286114dcb4dd1f264153363999ec81edd6f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qdoc: WebXML generator: List related non-members in the outputTopi Reinio2018-05-231-0/+2
| | | | | | | | | Related non-members of a class are not children of the class node but a separate data structure. Change-Id: If440788d37f6d3f18f939d9759f4d2f9fcc0c8a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-182-200/+213
|\ | | | | | | Change-Id: Ib45be3626278d9bac03ff0b8f8ab0487ada2d206
| * Fix logic for choosing static or dynamic libclang linkagev5.11.0-rc2v5.11.05.11.0Simon Hausmann2018-05-161-1/+1
| | | | | | | | | | | | | | | | Amends commit 36e7b1925e2ff2df167280eb3592b99697a1234d. Task-number: QTBUG-68178 Change-Id: Ie2f9ac98740b7cef325426da2efff469382444e7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Allow to link qdoc dynamically to libclangJędrzej Nowacki2018-05-142-200/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For releasing we want to link qdoc statically to libclang and ship a "fat" binary, which allows us to not distribute separate libclang. In the same time our users may want to link qdoc to an existing libclang binary. Both cases make sense, especially that the static build required some invasive patches in libclang. Partially reverts fddf7ee536e4fd0061d0ee933707881cebe54223 Task-number: QTBUG-68178 Change-Id: Iaeab59c40b881907f0fd5f3ccefb6700dcd2dded Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-093-3/+274
|\ \ | |/ | | | | Change-Id: I157112adcd7e754a2243c1aa13c75c140dbc6369
| * Fix disabling of qdoc build when cross-compiling with MinGW hostv5.11.0-rc1Simon Hausmann2018-05-031-1/+1
| | | | | | | | | | Change-Id: I5a069821a0dd05328e98eca9ba201b44bedd6cbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Disable QDoc on MinGWJędrzej Nowacki2018-05-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These two changes broke QDoc build on MinGW: "Link qdoc to static libclang" (fddf7ee536e4fd0061d0ee933707881cebe54) "Update clang version to 6.0" (c5ddbdb86b837fcdd406d12e66d8193c991bde) To get Qt 5.11.0 release out in time we need take a shortcut and disable the QDoc build. We agreed that qdoc binary will not be provided on mingw530. Task-number: QTBUG-66015 Change-Id: I25c6014754c58bc3202af645ef77ebc8bfaf1291 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Link qdoc to static libclangJędrzej Nowacki2018-04-292-3/+202
| | | | | | | | | | | | Done-with: Mikhail Svetkin <mikhail.svetkin@qt.io> Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Add changes file for Qt 5.11.0Antti Kokko2018-04-261-0/+65
| | | | | | | | | | | | Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: If9838f027e59686a49f7e7c590f4d4fb8eaa3261 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Warn when an asset is discarded due to unmet dependenciesAleix Pol2018-04-201-11/+7
|/ | | | | | | | | When generating apks we sometimes remove some assets because they won't be useful at runtime anyway. Make sure the pacakger knows so he can take action if required. Change-Id: I91c8f82b0d21d4fe0757d0a4d6f193b984c97627 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* windeployqt: Improve detection of Qt librariesFriedemann Kleint2018-04-191-7/+5
| | | | | | | | | | Remove the special handling which is no longer relevant and check on the major version in addition. Task-number: QTBUG-67762 Change-Id: If9acabfb6c9d9f6ff1fccf91c98ddd540415ab49 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* linguist: Add Done action in Translation menuJosep Llodrà2018-04-186-1/+33
| | | | | | | | | | | | | | | In some situations you may want to mark a message as Done without automatically jumping to the next untranslated message. If you are revisiting (or fixing) some specific translations, using "Done and Next" would constantly jump to another segment for every change made. You can now mark a message as translated using Alt+Return, but also through the Translation > Done menu item. Change-Id: I1a3c95fcf321a793c1b726ec13733c61f15caa05 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Mateusz Starzycki <mstarzycki@gmail.com>
* linguist: Show context also for guesses without shortcutJosep Llodrà2018-04-171-1/+1
| | | | | | | Amends 04e7f6668d. Change-Id: I9401d7bab1266e99fca7df67653410f0e933d61d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qdoc: WebXML: Fix generation of module pagesTopi Reinio2018-04-171-1/+1
| | | | | | | | | Collection nodes (such as module pages) are no longer aggregates, check for them explicitly. Task-number: QTBUG-66545 Change-Id: I6b50a049138c44f2e99fe06cebc99887f2408c2e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* linguist: Add actions in View menu to show more/fewer guessesv5.11.0-beta4Josep Llodrà2018-04-134-4/+76
| | | | | | | | | | | | | | | | | | | | Three actions have been added to the main View menu (Guesses submenu) in order to easily change the number of Guesses displayed. View Menu ...... Guesses > Show more (alt - +) [shows 5 more guesses] Show fewer (alt - -) [shows 5 fewer guesses] --- Reset to default (alt - 0) [resets to 5 guesses] ...... Motivation behind this commit is that in large UIs with thousands of strings, 5 guesses are not enough in some situations to gather all the information necessary to correctly translate a string. Change-Id: I3fdc1b8fc27af40300897cdfd1f9fa3620caad55 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
View Lorry Controller Status