| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
|
| |
| |
| |
| |
| |
| |
| | |
Fixes output of \since, \preliminary if associated with a module.
Change-Id: I760963135283d4978225e2ad72f3c0c6df852e56
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Both JSON and qdoc output files should be generated in UTF-8.
Change-Id: I7d60d9042bcc1e8d69e164691fcc4129d4e95fb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With macOS High Sierra, Apple machines using SSD see their file
system changed for APFS automatically.
hdiutil by default uses the current file system to build the dmg file
which in this case makes them unusable on older version of macOS that
don't have support for APFS.
This patch adds an additional option to macdeployqt to select the
file system to use when building the .dmg. It defaults to HFS+ which
was the official file system used until now for all currently
supported version of macOS.
[ChangeLog][macdeployqt][feature] Added support for selecting the
file system type to use when building a .dmg file. Defaults to HFS+
to support a wider range of macOS versions.
Task-number: QTBUG-65844
Change-Id: Ic66856344f96c6536b224d13d309715b34eb0874
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
| |
| |
| |
| |
| | |
Change-Id: Idbaae38cc24e36f1309995bf7c4f47a41c08db5c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c
|
| |\
| | |
| | |
| | | |
Change-Id: I3032d151c1bbf11b61be2ffbeed7db4588159db2
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I3e95fd8746c22bcde69605b15ee845f977679d24
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Idaaeec1e0f84573fe87c32b9714a3c9f490dd7dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Windeployqt currently doesn't deploy the Qt3DAnimation dll when the
module is used. This patch fixes this.
[ChangeLog][Windows][deployment] The Qt3DAnimation dll is now deployed
when the module is used.
Change-Id: Ibff744192f6a3e028bb096e33f596cba948b229b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The handle is closed in AppxEngine's destructor.
Change-Id: If672f247537d57705cc18b70e3e5842fca40cb4c
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
| |/
| |
| |
| |
| | |
Change-Id: I8e7d1dcf9cd2a5a1ccc563032324528fe3262611
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The bookmark manager would only update the persistent storage in its
destructor. Since that is not called on an unclean process
termination, bookmark changes would be lost. Fix by updating the
persistent storage after every bookmark change.
Task-number: QTBUG-50350
Change-Id: Id03d5ea96df15d01fdf482203aaf1db7166a7036
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The search index writer would treat all input files as html. This led
to .txt files being stored with empty titles (no <title> tag would be
found). That again led to unusable search results in Assistant,
showing only the snippet, but no clickable title link.
Fix by special casing for .txt files, using the file name as title,
just as QHelpGenerator does.
Task-number: QTBUG-62250
Change-Id: Id82a780dadc2d4ff5866a565337f86c798b952a5
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
| |
| |
| |
| | |
Change-Id: I9786562c1fab729ae11ce71cda26c2f571a80fac
|
| |
| |
| |
| |
| |
| |
| |
| | |
The file name was changed.
Task-number: QTBUG-65015
Change-Id: I0a81a42abae3bcf9b124acbea55ba4e275594016
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The CMake macro now determines the file names of the given ts files
correctly when a file name contains multiple dots. Instead of using
the first dot to identify the file extension now the last one is used.
Task-number: QTBUG-64317
Change-Id: I9a8423307679fb722fb4b0bc2f0af19f0f7ee821
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
|
| |\
| | |
| | |
| | | |
Change-Id: Ic2251f8c075b304ca0f48f10476d970cb21918bc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Visual Studio projects for winrt usage rely on a proper list of files
that are deployed. We concat translation files into a single
qt_<prefix>.qm file using lconvert, but also mention every "sub file"
(qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and
thus should not be done on that platform.
Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since Qt Assistant no longer uses Qt WebKit then we need to open the
PDF files externally to ensure that they are shown.
Change-Id: If659c15524e106c9974ead144afe2048452a4c22
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Items written to index have the URL attribute set, but qdoc only used
it if it was able to resolve the relative index URL.
If the documentation was generated using a single-directory output
config, the relative index URL is an empty string (which is correct).
But even in that case, we need to set the href (filename + anchor) as
the node's URL.
Change-Id: If17cb9a42663b7d6f8f1444094129d5052699fbd
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The missing headers were included indirectly
through the QHeaderView, QButtonGroup or QAction
inside the generated ui files.
Now, the generated ui files won't include QHeaderView,
QButtonGroup nor QAction, so we need to include the
missing headers explicitly.
Change-Id: Ie10d9fc23a6032be44fcb11a3c1d275f8437cb92
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use setTabStopDistance() instead.
Change-Id: I0164d63818473329eb88e1a0658de312de6d00ec
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When deploying a QtLocation or QtPositioning based application, only
the frameworks were deployed. This patch fixes this by also deploying
the corresponding plugins.
[ChangeLog][macOS][deployment] QtLocation and Qt Positioning plugins are
now deployed along the frameworks.
Change-Id: Ib3ceabcd86d69039dcd8ab6ae361ed6e3a5821a6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Rather than adding new cases per module, use a map that will make it
cleaner to associate modules with their corresponding plugins.
Change-Id: Ia745066ec394f72d64b4ffe74ece4bbbf48aa2ac
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I66dbc74cef6cbe6437782738a3ceeb4999167951
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Files to test binary compatibility for 5.10 added
Change-Id: I7eb4034e5aea519c8ecebcd6d75319a2647e0b19
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|\ \ \
| | | |
| | | |
| | | | |
Change-Id: Idebf1c3bace79b0d316a63e362af4586b2701a0e
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Visual Studio projects for winrt usage rely on a proper list of files
that are deployed. We concat translation files into a single
qt_<prefix>.qm file using lconvert, but also mention every "sub file"
(qtbase_<prefix>.qm etc) in json. That breaks deployment on winrt and
thus should not be done on that platform.
Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit a134cb1855622694355d8564b2f6aa0b7bf08b29)
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |\ \ \
| | | |/
| | |/|
| | | | |
Change-Id: I7c5be528f6f3c80014a1f465f2a5c12eb14b90f0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ie3ca0743147049bca5cfb5963197bf4c0ab4a7ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I1236e10ae81e5cc3e0debb70e3e0c9570633b4a8
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'navigation' sub-variables 'cppclassespage' and 'qmltypespage'
already have associated variables that allow defining a user-visible
title, shown in the navigation.
This commit does the same for 'homepage' and 'landingpage'. This
makes it possible to avoid situations where the homepage title
clashes with another (e.g. section) title:
navigation.homepage = index.html
navigation.hometitle = "Qt $QT_VER"
Add documentation for the navigation variables.
Change-Id: Ie4ff5f906b2ee6be01db65562025df7da2a9dff8
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Idb919f217f1dea42728fd9318fd9f48d9c3d3f29
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If there is a QSqlDatabase or QSqlQuery object around still that is
active then when removing the database it will output a warning. Since
the database was not opened here we just need to ensure the object is
deleted first before we remove it.
Task-number: QTBUG-59664
Change-Id: I95d658e178e3e5b95231e4d9525bf5994f5969c5
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The target part of a json entry has to be a directory and not the final
file name.
Change-Id: I61c5649c61a3f539f58af7b636fc0ca1acb94c77
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Fix in Qt Designer, pixeltool, qtattributionsscanner and qtpaths.
Change-Id: Ideae055e8880552c1b8bf5a2a38326ac1356ffcb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Sorting QML modules makes sure a module is deployed before its sub-modules,
avoiding the problem where macdeployqt would consider a module as deployed
because one of its sub-module has already been deployed.
Task-number: QTBUG-47067
Change-Id: I0ab8dd827fcd6eea0f0573157101ceb8f1a045fc
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When deploying a Qt3D application, only the frameworks were deployed.
This patch fixes this by also deploying the corresponding plugins.
[ChangeLog][macOS][deployment] Qt3D plugins are now deployed along the
frameworks.
Change-Id: I53f2f94ced10629d80d6a3d9af38a3f9517ae6bc
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-64078
Change-Id: I2c23e440d6355effa384a56a215e92115be75a35
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I52989b7b997999263df77361fdf75939c73f35f7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I9069b01eb82dfcce33e2afae3be853f7a5bd1fa8
|
| |
| |
| |
| |
| | |
Change-Id: I6a75c9e29e2c789ac12d9d7b065ec502a322683c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I72581f2788fe3e8d81e50248929127408f639c9c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia4a9d8cf397ed09f9558584d7d1403f92d81d5a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pass the options struct to deployTranslations() and add the files
to JsonOutput.
Task-number: QTBUG-63744
Change-Id: Ie1d8587cbeb22acc2fdcfba6e666059e3936c708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia043a1ef5cb89f72a22121b22b3914e1d5220f84
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts 112540645d78000ad8dfed1bca6662a10522aaf1. The deleted
pointer is not dereferenced. The pointer value is used as the key in
the map. QMap::remove uses the parameter as a number.
Change-Id: I668d22a0ba21a2f6696b4dfefc617f363d7760d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I45b89b7b0d33eb1e64daae1275661a79e27370df
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This could cause an immediate crash or incorrect values might be read
subsequently resulting in incorrect computations.
In
QtVariantPropertyManagerPrivate::removeSubProperty(QtVariantProperty
*): A pointer to freed memory is dereferenced, used as a function
argument, or otherwise used (CWE-416)
Coverity-Id: 22144
Change-Id: I0cd9c37769470e9c6f3d50fb53666b7db3e03c62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|