summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-017-75/+77
| | | | | | | | | | | | | Fixes some unprefied textstream usages. Bump the module version to 6.0.0. Also windeployqt auto test is temporarily blacklisted because with the current situation it's not possible to make it pass both with a 5.x and a 6.x Qt build, and thus this would prevent a qt5.git integration. Change-Id: If750cf4f50ba4215cb63b53c42971f3d1f1c8160 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix Qt6 buildAlexandru Croitor2019-07-2914-16/+47
| | | | | | Change-Id: Ie413ca2e2f81ac0e92628ffd2f3e93047a91bd0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qdoc: Remove hard-coded -fno-exceptions Clang optionTopi Reinio2019-07-031-1/+0
| | | | | | | | | | | | | | | This was a workaround for http://reviews.llvm.org/D17988 that has now been fixed. This commit enables exception support for code parsed by QDoc. If required, the option can still be defined using 'clangdefines' qdocconf variable. Task-number: QTBUG-76795 Change-Id: I010293b25fb7833a267a6a488cbe94a477352664 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Michael Vlach <vlach.michael@gmail.com>
* Qt Designer: Add a setting for calling connectSlotsByName()Friedemann Kleint2019-07-018-134/+257
| | | | | | | | | | | | | Add a boolean attribute to DomUI and a form setting, allowing for per-form migration to the Qt 5 connection syntax. [ChangeLog][Designer] A per-form setting for disabling generating calls to QObject::connectSlotsByName() has been added to support migrating forms to Qt 5 connection syntax. Task-number: QTBUG-76375 Change-Id: Id59d4689287fdec025c199e4efc87a919e37ae9e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-297-23/+194
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-297-23/+194
| |\ |/ / | | | | Change-Id: Ibe9557a8639e2717c646b40ad25511e7bea55168
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-286-23/+190
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-276-23/+190
| | |\ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3a828f7cf61510f0bb179b760c8a335629d3c852
| | * qdoc: Avoid duplicating version strings in HTML <title> elementTopi Reinio2019-05-311-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 802aa37f introduced full version strings into the titles in HTML header. However, for pages that already included a prefix of the version information (e.g. 'Qt 5.13'), this meant that the version appeared now twice ('Qt 5.13 5.13.0'). This commit checks for the presence of a version prefix in the title and only appends the full version if one is not found or does not match with the project version (which for Qt modules is QT_VERSION). Fixes: QTBUG-74301 Change-Id: Iceb3cf8f0e0181709e547a87cb6e92a6a13dcfef Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Qt Linguist: Document CMake macrosKai Koehne2019-06-202-0/+127
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-72159 Change-Id: I817e1d562675c0aa462706a1e90e758030ce7d1e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * distancefieldgenerator: Fix failure reading CMAP for some fontsEskil Abrahamsen Blomfeldt2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If all the range offsets in the type 4 subtable in CMAP is equal to 0, there is no need for a glyph ID array, so this array can actually have zero length. We did not account for this, and would fail to read those fonts. Task-number: QTBUG-76188 Change-Id: I11873fba7214d179af1fcd7ccff9a9fd1c72ce10 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * distancefieldgenerator: Fix crash with multiple texturesEskil Abrahamsen Blomfeldt2019-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the allocated area starts at (0,0), since we allocate a texture at [width x height], and this would be too small if it did not also account for possible gaps at the top of the cache. This happens because glyphs may sometimes end up at the edge between two textures, in which case we will reserve space for them in the second of the two even though this is not needed. So this is a deficiency in the cache logic itself, but we need to at least make sure it does not crash. [ChangeLog][distancefieldgenerator] Fixed possible crash when generating large number of glyphs with a small texture size. Task-number: QTBUG-76188 Task-number: QTBUG-76528 Change-Id: I84c87c72985f5b621d120e7526cfe071555fa7f8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * distancefieldgenerator: Remove unused variableEskil Abrahamsen Blomfeldt2019-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | The total allocated area was never used. Change-Id: I1aad1d4349ec94e2ccc521903b304270decd1d0d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * distancefieldgenerator: Avoid exceeding max texture sizeEskil Abrahamsen Blomfeldt2019-06-201-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we use a single area allocator for all textures, a glyph on the edge between two textures, would end up spanning two textures. It would be assigned to the first, and which in turn would be expanded to account for the additional data. The result was that the texture height exceeded the maximum size set. This is actually an inherited problem from Qt Quick, but it happens more frequently with the distancefieldgenerator because you will typically generate a large number of glyphs, and also the default max size set is quite low to be on the safe side. The bandaid in this patch is to pad the texture height by the size of one glyph, which will for the most part get rid of the problem, except for fonts where a majority of glyphs exceed the em square. [ChangeLog][distancefieldgenerator] Fixed a bug where the generated textures might exceed the maximum height. Task-number: QTBUG-76528 Change-Id: I51487bbf7c46556b022bfd45cefc8776d0272de3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+34
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+34
| | | |\ | | |/ / | | | | | | | | Change-Id: Ib726e156ac4c2cc8e939f0a395c954b666fd4e30
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95212a61dddc2f4bc0a7e3700c52679986188b77 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: I431c0fe718d173a6c45ade6b17b461586a5f0ca7
| | * | distancefieldgenerator: Fix cmap error for some fontsEskil Abrahamsen Blomfeldt2019-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would accidentally use the raw field from the font without converting its endianness, thus we would sanity check against the wrong length and print out error messages for some perfectly valid cmap subtables. [ChangeLog][distancefieldgenerator] Fixed bug where the tool would fail for valid fonts with the message "end of cmap table reached when parsing subtable". Task-number: QTBUG-76188 Change-Id: I7f84f4e161da705b49423ed3cc16a78cee67c607 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | qdoc: Don't let qdoc run without a project nameMartin Smith2019-06-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc can't produce useful output if the project variable is not set in the qdocconf file. This update ensures that the project name is not empty. If it is empty, qdoc emits an error message in its log and terminates. Change-Id: Ic8d84987efe551651a06d720486960c4c62cb8a8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Fix translation unit debug output for parseFnSimon Hausmann2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parseFn() uses its own arguments vector (args), which is passed to clang_parseTranslationUnit2 and that's also what should be printed in the debug output. Change-Id: Ib8be035203aa3887fc79d0695e846e9b2924a191 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Adapt to new signature for QQmlJS::DiagnosticMessageUlf Hermann2019-06-242-21/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I6282b4ba75fbb5f5c763044b29ed2f6cf2eaffd6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Remove usages of deprecated qSortSona Kurazyan2019-06-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: Ied0ecb369697b3cc01fef7a2d91aa3940cdcd771 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | Revert "QDoc: Remove unused code"Paul Wicking2019-06-202-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e6d86264bc145fe543bcfe534737f6c7fb7f584d. Reason for revert: The instance of the empty PlainCodeMarker class is used by logic that expects a CodeMarker as the last element in the CodeMarker::markers list. Removing this class thus resulted in undefined behavior and random hangs running QDoc. Change-Id: Ifb17d0eba784efaa6e29e10607a85bf824ab3469 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | QDoc: Remove unused codePaul Wicking2019-04-082-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PlainCodeMarker class in unused except for being instantiated in main.cpp. This patch removes the unused code to reduce clutter. Task-number: QTBUG-71165 Change-Id: I63a26df703d23f2ea8f79b4fc9ada9a3e7d51bb2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Eradicate some easy Java-style iteratorsMarc Mutz2019-06-183-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java-style iterators are scheduled for deprecation, or at the very least banned from use in Qt code. There are two more complicated ones left in the code for a later commit. Change-Id: I0c843ddcf2c67793b56ab99a219d36a0694c7b09 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-184-47/+78
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-184-47/+78
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: If77476dd8230654b179c7020d84dd240cc3f47b9
| * | | Remove extra \n when reading translator comment from .po fileLucie Gérard2019-05-241-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extra \n was added at the end of the translator message (cf slurpComment). This was visible from the ts file in case of convertion. But the round trip .po to .ts to .po was correct because of the way messages are read from the .ts file (cf poEscapedLines) Both functions are modified, no extra \n is added, the roundtrip works, autoTest are all passed. Fixes: QTBUG-67908 Change-Id: Ie55572f9609c71c164b2ab939bf0c0d0ca1afc20 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | qdoc: Build artificial module headerMartin Smith2019-06-071-35/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update lets qdoc build an artificial module header whenever it can't find the project's module header. The artificial module header contains a #include "/absolute/path/header.h" for each header found using the project's headerdirs and headers variables in the qdocconf file. header files with names ending in _p.h are not included in the artificial module header. The ordering of the includes in the artificial module header is not controlled, so the includes must not be order-dependent. Task-number: QTBUG-76005 Change-Id: I9d0975c571b29e0c3c5972a4e1f78427c595d52d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-112-6/+18
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-112-6/+18
| | |\ \ \ | |/ / / / | | | _ / | | | / Change-Id: Ib0252441ebf43cbd0857bae7b72a7567473105fa
| | * | lupdate: Improve documentation of -recursive, -no-recursiveKai Koehne2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'the following' directories can be read in the sense that the arguments are positional, and that e.g. lupdate -no-recursive x -recursive y will scan x without subdirectories, but y with subdirectories. However this is not the case; -recursive and -non-recursive are binary options that affect all directories scanned in a run. Task-number: QTBUG-76243 Change-Id: I417a84708b7228890d0644aed582dbb9073de1a8 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| | * | Close the last SELECT query with pending resultsJarek Kobus2019-05-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we close the last SELECT query in case we read just one result. If we don't iterate over all results available, the query may block the database connection. The other database connection won't be able to interact with database until the open query is closed. Fixes: QDS-779 Change-Id: I30cece520918a10972deaa3d093ffaea11cab5c0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | | Qt Designer: Fix some clang warningsFriedemann Kleint2019-06-0513-53/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - else after return/break - Misleading indentation - Use reference for const-copies - Mixing const/non-const iterators - Unnecessary pointer check before delete - Unhandled enum value Change-Id: Iecc684d4acf4284b2cd6b1dbd14e392db7ea580c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Port from QLatin1Literal to QLatin1StringGiuseppe D'Angelo2019-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLatin1Literal is an undocumented and deprecated typedef for QLatin1String, just use the original. Change-Id: I8fb7e75deeca45f154a4a9b27e8dd3eea21d8df5 Reviewed-by: hjk <hjk@qt.io>
* | | | Qt Designer: Fix clang warnings about class structure/definitionsFriedemann Kleint2019-06-0549-199/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add missing override - Use "= default" for trivial constructors/destructors - Use Q_DISABLE_COPY/MOVE - Fix some function parameters Change-Id: Iaed3b6a85bdfd9e9e431746f77589a9e2029120a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Qt Designer: Replace 'typedef' by 'using'Friedemann Kleint2019-06-05110-257/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply Fixits by Qt Creator with some amendments (use Qt standard typedefs for QWidget/QObjectList and QOverload for slots). Change-Id: Icf0600d8e5381e83ae8037895c07a09d7e6b481a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Qt Designer: Replace Q_DISABLE_COPY by Q_DISABLE_COPY_MOVEFriedemann Kleint2019-06-0360-176/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clang warnings like: warning: class '...' defines a default destructor, a copy constructor and a copy assignment operator but does not define a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions Change-Id: I12ead44ddea8f6f69d75f99bea61e69ecac36db4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Qt Designer: Introduce nullptrFriedemann Kleint2019-06-05271-1288/+1288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Qt Designer: introduce member initializationFriedemann Kleint2019-06-1171-427/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings emitted by clang, use default constructors where applicable. Initialize remaining member variables about which clang warns about missing initialization in the constructor. Change-Id: Ic23a1f36f7507dc728ca6daf0d2067727125c0a9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-112-15/+6
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-112-15/+6
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: If7cf7604d1ead1cd1f9980a05ada6d2aa1de0dbf
| * | | qdoc: Don't log guessed include pathsMartin Smith2019-06-071-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A complaint about excessive logging was received because of the logging of each guessed include path when qdoc is not given any include paths at all. This update removes the logging of those lines and changes the remaining single log line to: No include paths passed to qdoc; guessing reasonable include paths Task-number: QTBUG-76204 Change-Id: I000ee7959f00f654e750ac1b68a0c2b6dcccd472 Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | | qdoc: Ensure Generator::fullDocumentLocation() returns a non-empty stringTopi Reinio2019-06-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function took the parent node's location without checking whether the parent is the root namespace. For example nodes (and possibly others), this meant that we got an empty location. This in turn resulted in QDoc omitting the 'href' attribute when writing an .index node entry for an example node, and consequently, linking failures. Fixes: QTBUG-76171 Change-Id: I984ada1b88468aab71d08ba7d102bd8661304dab Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Create CMake config files for DesignerComponentsVolker Krause2019-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by the QtCreator CMake port. Change-Id: I7ff9405f80f2e96f5988429a42e695627a884b30 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | | | Add CMake target for qtattributionsscannerVolker Krause2019-06-042-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less useful for external users compared to qdoc, but neeeded for CMake builds of e.g. QtCreator and GammaRay. Change-Id: I8861cf30a21102309fef5b7bf3baf2707abf2965 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | | | Add CMake target for qdocVolker Krause2019-06-042-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not pretty, but closely following the existing code for the linguist tools. Task-number: QTBUG-75868 Change-Id: I3a6d79a0c5706e129b6abcc5b0f3cb65c4b3e5c3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | | | Qt Designer: Remove unused codeFriedemann Kleint2019-06-049-38/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QDesignerMenu(Bar)::m_interactive and setters, which did not have any effect and other unused members. In helper function enumKeyOfObjectToValue(), remove the unused object pointers which are apparently some left-over from some old MSVC version requiring actual variables in template functions. Change-Id: If583ff4583be09601877acca80166384f0730fef Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-034-10/+20
|\ \ \ \