Tobias Koenig [Tue, 2 Jun 2015 09:43:30 +0000 (11:43 +0200)]
windeployqt: Add support for x86 based WinCE
Adapt windeployqt to support x86 based WinCE systems
in parallel to arm based WinCE systems.
Change-Id: I855db447524ebc55c68af5eaecbf9f6a448d9ed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Sze Howe Koh [Fri, 15 May 2015 00:11:00 +0000 (08:11 +0800)]
Qt Designer: Disambiguate the modules where widgets come from
- QWebView is from "Qt WebKit Widgets", not "Qt WebKit", "Qt WebView" or
"Qt WebEngine Widgets"
- QQuickWidget is for Qt Quick 2, not Qt Quick 1
Change-Id: Ifd3395cbbe632b0d17b37658044318ddf04770c9
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Shawn Rutledge [Thu, 28 May 2015 14:27:49 +0000 (16:27 +0200)]
Linguist: do not override the roles of Edit menu items
The menu items were staying disabled whenever the File dialog is open,
so it was not possible to use them to cut/copy/paste into the native
FileDialog (or its child sheets) on OS X.
Task-number: QTBUG-17291
Change-Id: I0b821bd85d6d614ad845f594e4d8d994e1386d94
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Liang Qi [Mon, 25 May 2015 09:03:48 +0000 (11:03 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82
jkobus [Fri, 22 May 2015 10:55:02 +0000 (12:55 +0200)]
Fix the include for QQuickWidget
Task-number: QTBUG-46139
Change-Id: I499b2fdaaf2ca72350a83a5a8a75eac94f0bcd76
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Alessandro Portale [Wed, 13 May 2015 14:05:44 +0000 (16:05 +0200)]
Fixup "androiddeployqt: Use correct package name when uninstalling"
This partially reverts commit
30329ce24004a54e0bd1bbeff2b139ab13bb6946,
making sure that updateAndroidManifest() works as it did before.
Change-Id: Ia6c28985224ffaa36063e7195e32864c4ce0b67e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Jani Heikkinen [Wed, 20 May 2015 12:09:18 +0000 (15:09 +0300)]
Updated WinRT license headers to use LGPLv3 instead of LGPLv21
From 5.5.0 -> WinRT port is licensed with LGPLv3, see
http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/
Change-Id: Idd2bd07705a9ccdc80d22e896acc42141a96d3ee
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Friedemann Kleint [Tue, 19 May 2015 09:45:32 +0000 (11:45 +0200)]
Qt Designer: Fix widget box settings.
The group name was used with incorrect case, which
no longer works in Qt 5/Linux.
Task-number: QTBUG-46201
Change-Id: I2be0eb74058dc2c7f5d36b0c5c53d04e50b41b36
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Sze Howe Koh [Thu, 14 May 2015 23:48:43 +0000 (07:48 +0800)]
Qt Designer: Update widget box labels
- Use correct names for 3rd-party technologies ("OpenGL")
- Use appropriate capitalization ("MDI Area", "Key Sequence Edit")
- Make labels as similar to the corresponding class names as possible
(QDialogButtonBox, QCalendarWidget)
Change-Id: I3d9b1b77b62444496589c7c4a80f3ffb86f27e67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Friedemann Kleint [Fri, 10 Apr 2015 08:20:09 +0000 (10:20 +0200)]
Qt Designer: Introduce Q_DECL_OVERRIDE.
Replacement done by a script and verified with clang 3.5 to not cause
new warnings.
Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Tue, 17 Mar 2015 15:34:10 +0000 (16:34 +0100)]
Update Qt Designer documentation.
- Document new QUiPlugin module.
- Fix example documentation to reflect the changes in
the qmake variables (QT/CONFIG).
Task-number: QTBUG-44724
Change-Id: Idd85d601295af25d634c3186e993abc7090fe002
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Morten Johan Sørvig [Mon, 11 May 2015 10:07:01 +0000 (12:07 +0200)]
MacDeployQt: handle "./" in app bundle name
Use QDir::cleanPath() to normalize the app bundle
path.
Change-Id: I35053507dd11de986b9f43276e41d9fe3eff0fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Yoann Lopes [Fri, 8 May 2015 15:43:48 +0000 (17:43 +0200)]
androiddeployqt: fix possible infinite loop.
Change-Id: Id9965521f69c999a417d2b1f54b49b145dd4f32c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Stephen Kelly [Mon, 13 Apr 2015 21:48:44 +0000 (23:48 +0200)]
Test the Qt5UiPlugin cmake module with CMake 3.0.
Test that the forwarding headers work when using the QtDesigner module it
was extracted from. Test that transitive usage requirements of the
Qt5::UiPlugin module are available through the usage of the Qt5::Designer
target when using CMake 3.0.
Change-Id: I200b5cf111f0160be2504727ab4111ce8a1d6170
Reviewed-by: Stephen Kelly <steveire@gmail.com>
Oswald Buddenhagen [Tue, 14 Apr 2015 13:53:12 +0000 (15:53 +0200)]
move ui loader interfaces to own module
it's backwards to declare the interface as part of the designer library
itself, as that obviously pulls in half of designer itself into custom
widget plugins which should be perfectly usable from the stand-alone
ui loader in uitools. also, designer isn't built for embedded systems,
so the bundling needlessly limited the availability of widget plugins.
so move the relevant headers into a separate include-only module.
the designer module retains forwarding headers, as the old includes
obviously need to continue working.
[ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin
instead of QT+=designer. This makes them usable on embedded systems.
Task-number: QTBUG-44724
Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Oswald Buddenhagen [Tue, 14 Apr 2015 13:50:00 +0000 (15:50 +0200)]
fix exported dependencies of uitools module
move the include which declares the correct dependencies to a place where
qt_module.prf can see its effects.
Change-Id: Iba5e2569e35de0b28b75042d49186077f49a06bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Oswald Buddenhagen [Fri, 13 Mar 2015 15:22:07 +0000 (16:22 +0100)]
remove extension.h duplicate
it was there only because uilib used to temporarily live in qtbase.
however, the header's inclusion into customwidget.h was pointless in the
first place, so just nuke it.
Change-Id: I85b89e397e4393987192de05ec74e8c2328d2b32
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Oswald Buddenhagen [Thu, 12 Mar 2015 15:50:04 +0000 (16:50 +0100)]
move container.h to sdk/
QDesignerContainerExtension has absolutely no business in uilib - it's
not about dynamic .ui loading, but a customization of designer itself.
Change-Id: I4fe9acf2c07bc06e0f0d34c541e5d6300a1dc7ce
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Sergio Martins [Wed, 6 May 2015 20:04:07 +0000 (21:04 +0100)]
Fix misoverloaded virtual due to recent change in qtdeclarative
qtdeclarative/
9d7b27f5bf44 changed the method's signature.
Added Q_DECL_OVERRIDE so it doesn't happen again.
Change-Id: I98cbd521d8b115c12f00b35a53fc1b773e339160
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Friedemann Kleint [Wed, 6 May 2015 07:02:16 +0000 (09:02 +0200)]
windeployqt: Additionally check on Qt5WebKit[d].dll for ICU dependency.
Qt 5/Windows is no longer configured with -icu by default, only QtWebKit
still depends in it. Its library needs to be checked for ICU as well.
Task-number: QTBUG-45962
Change-Id: Ib08c2ece446f4f1cc4db2410fc0e554363181a6c
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Andrew Knight [Sun, 3 May 2015 10:36:22 +0000 (13:36 +0300)]
winrtrunner: Remove the app when stopping on Windows Phone
The native API fails to stop the app, but removing the app will
successfully stop it. Until we have a reliable way to stop the
application, simply remove the app instead.
Task-number: QTBUG-41946
Change-Id: I98662103a7242f806e2eb5ef06cfd60372df681a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Andrew Knight [Sun, 3 May 2015 10:21:25 +0000 (13:21 +0300)]
winrtrunner: Remove Xap engine
Windows 8.0 and Windows Phone 8.0 support have been removed from Qt, so
remove references to them in winrtrunner.
Change-Id: Ifcb6f60b6122b94ff453aa23334263d4b828608a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Alessandro Portale [Thu, 23 Apr 2015 10:59:55 +0000 (12:59 +0200)]
androiddeployqt: Use correct package name when uninstalling
When calling androiddeployqt with "--install --no-build", it will try to
uninstall a package with a wrong package name. This patch attempts to
read a valid package name from the AndroidManifest.xml before
uninstalling.
Task-number: QTBUG-45433
Change-Id: If2bc788753a24dd752492464c985de70c67b8f72
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Oswald Buddenhagen [Mon, 27 Apr 2015 18:04:26 +0000 (20:04 +0200)]
invalidate message index when inserting in the middle
subsequent offsets become invalid when a message is inserted in the
middle, so the index must be invalidated (adjusting the offsets on the
fly doesn't seem worth it).
also, there is no point in updating the index if it is already invalid.
Task-number: QTBUG-45831
Change-Id: I9733cb3235c6b8b09dee7eae4d2ecf0a0cdda528
Reviewed-by: hjk <hjk@theqtcompany.com>
Oswald Buddenhagen [Mon, 27 Apr 2015 18:36:32 +0000 (20:36 +0200)]
update message index when message gains source text
when a message which is first seen with only an id later gains a source
text, this text would not have been indexed. so a subsequent new message
with the same source, but without an id this time around, would not be
seen as a dupe of the first message.
Change-Id: Ib35f820e2b02311ea9c9996383a2789095098d6f
Reviewed-by: hjk <hjk@theqtcompany.com>
Friedemann Kleint [Fri, 24 Apr 2015 10:44:08 +0000 (12:44 +0200)]
windeployqt: Append Qt bin directory to path.
Ensure qt.conf is taken into account when running qmake -query.
Task-number: QTBUG-39177
Change-Id: I0a8260033f49ddb21bf46ccbfe576ddb00db5679
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Oswald Buddenhagen [Mon, 20 Apr 2015 10:28:25 +0000 (12:28 +0200)]
Bump version
Change-Id: Ib3ce9b642f65dc89847a61332d00ff9cde04d596
Maurice Kalinowski [Mon, 13 Apr 2015 13:11:10 +0000 (15:11 +0200)]
Add location to the supported module list
Qt 5.5 introduces Qt Location and the plugins were not deployed so far.
Change-Id: Ic06322a672a392a87b1c0f159b7028651fc2762a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Tobias Koenig [Mon, 13 Apr 2015 07:16:16 +0000 (09:16 +0200)]
linguist: Fix loading of multiple identical source texts
Show all translations from all .ts files in case
they provide the same source text and comment multiple
times with different IDs.
Previously, Qt Linguist showed the translations only for
the first occurrence, because the merging code in
MultiDataModel::append() compared only source text
and comment, but not the message ID in case it was there.
Task-number: QTBUG-45520
Change-Id: I3b527f0d9ce67a88e1c235f4b67d106cc0a49dc2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Adam Strzelecki [Sat, 1 Nov 2014 19:46:26 +0000 (20:46 +0100)]
macdeployqt: Support Qt frameworks using rpath
This makes macdeployqt understand dependencies expressed with @rpath
prefix which are resolved using Mach-O LC_RPATH commands.
Follows up
c0a54efc4091b365ffac09fc2827cf92f849d698 from qtbase.
Task-number: QTBUG-31814
Change-Id: I83156815e236ae52306aaecfc84f99d097284fa8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Friedemann Kleint [Fri, 10 Apr 2015 09:42:18 +0000 (11:42 +0200)]
Qt Designer Examples: Fix code around constructors.
Make constructors explicit, use constructor initialization for member
variables, remove unused variables.
Change-Id: I84273400d66ef061376bd0ec4948ab1a0fd45f30
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Fri, 10 Apr 2015 09:24:26 +0000 (11:24 +0200)]
Qt Designer Examples: Fix includes.
Replace module includes by per-class includes and reorder.
Change-Id: Id8273865c0110e6d834d9c40a123e3d72bfc4b87
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Fri, 10 Apr 2015 09:18:01 +0000 (11:18 +0200)]
Qt Designer Examples: Introduce Qt 5 connect syntax.
Change-Id: I6f0f1fad45412ab3dd7b5ff82f9cab789b805080
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Fri, 10 Apr 2015 08:52:32 +0000 (10:52 +0200)]
Qt Designer Examples: Introduce Q_DECL_OVERRIDE.
Change-Id: I08b4227e4609caef74576ea4e05d33c7142f2665
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Tue, 3 Mar 2015 12:29:10 +0000 (13:29 +0100)]
Qt Designer: Suppress updating of QAction's object name when editing existing actions.
Suppress the updating on clearing the text for existing actions
that have non-empty names initially.
Task-number: QTBUG-44778
Change-Id: Iedf59d5c8ac2ca356ed86774de677c6faf08afc7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Wed, 8 Apr 2015 13:51:51 +0000 (15:51 +0200)]
Fix license text in XSL template used for generating ui4.cpp/h.
Change it back to "tools applications" (Designer/uic) as was in Qt 4.
Task-number: QTBUG-45442
Change-Id: Ib8f4a2310fc4073464b14e45af6981a85be48031
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Friedemann Kleint [Thu, 2 Apr 2015 14:44:29 +0000 (16:44 +0200)]
Qt Designer: Enable reset property for multiselection.
When working with a multiselection in the property editor, the reset
button was previously only enabled when the property was modified on
the selected/current widget. With this change, reset will always be
enabled when the property is modified in one of the widgets of
a multiselection. Unmodified widgets will be filtered out when
initializing the command.
The intended use case is mainly to enable conveniently clearing all
minimumSize/maximumSize constraints of a form by doing Ctrl+A
to select all and then do reset on the property.
Change-Id: Ideab87cab79e9404941d5594653f12c13515c1ae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Friedemann Kleint [Wed, 1 Apr 2015 10:21:57 +0000 (12:21 +0200)]
qtdiag: Add AppDataLocation.
Change-Id: Ia5154a6463a0a5947f8346f18718f0f0027fd89a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Thiago Macieira [Tue, 17 Mar 2015 21:57:12 +0000 (06:57 +0900)]
qtplugininfo: Default to printing the metadata in a nicer form
Change-Id: I1a800c709d3543699131ffff13c3801cee682635
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Mon, 16 Feb 2015 21:29:40 +0000 (13:29 -0800)]
qtplugininfo: Add some extra validity checks on the metadata
Useful for debugging why a plugin file does not load.
Change-Id: I1a800c709d3543699131ffff13c37f93f85fac1d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Mon, 16 Feb 2015 21:25:24 +0000 (13:25 -0800)]
qtplugininfo: Print the plugin name the metadata is from
If there are more than one files passed on the command-line. Like grep.
Change-Id: I1a800c709d3543699131ffff13c37f584d830ff6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Mon, 16 Feb 2015 21:20:05 +0000 (13:20 -0800)]
qtplugininfo: Always print the tool name and the filename first
Like moc and cat:
$ cat foo
cat: foo: No such file or directory
$ moc foo
moc: foo: No such file
Change-Id: I1a800c709d3543699131ffff13c37f0dfdeefc5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Friedemann Kleint [Thu, 26 Mar 2015 11:11:44 +0000 (12:11 +0100)]
qtdiag: Add information on touch devices.
Change-Id: Ibe28292df577bf12311b91952df9034b9636589a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Leena Miettinen [Wed, 25 Mar 2015 14:07:55 +0000 (15:07 +0100)]
Doc: make examples visible in Qt Assistant TOC
And in Qt Creator Help Contents, too.
Task-number: QTBUG-45222
Change-Id: I1011242826f227e39768293fc3e5404ba073f17e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Thiago Macieira [Thu, 18 Dec 2014 03:38:48 +0000 (19:38 -0800)]
Remove the old headersclean unit test
We have configure -headersclean now
Change-Id: I1817798e76d5bd037c26dad308a22354b9cfd185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Frederik Gladhorn [Tue, 17 Mar 2015 08:49:02 +0000 (09:49 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I5a49f9e755d85ea160fcf2ccfbc691ce0c17b458
Friedemann Kleint [Fri, 13 Mar 2015 15:07:47 +0000 (16:07 +0100)]
windeployqt: Add Qt3D module.
Change-Id: Id4a47955a100fad3b22fc12141a8f63057dcbe7c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Leena Miettinen [Fri, 13 Mar 2015 14:11:13 +0000 (15:11 +0100)]
Doc: add image path for Remote Control Example
So that it will not be marked "broken" in
Qt Creator examples.
Task-number: QTBUG-41996
Change-Id: I22cd0efc28a46ab99a5d8aee57a5a3f76714d447
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Friedemann Kleint [Wed, 11 Mar 2015 14:15:48 +0000 (15:15 +0100)]
qtdiag: Update to output values of newly added API.
Task-number: QTBUG-44348
Change-Id: Idda5a09c77d5adca866d3b330292ec10cc549453
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Sergio Ahumada [Fri, 13 Feb 2015 17:46:40 +0000 (18:46 +0100)]
bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64
Remove the ia32 data since there are no linux x86 machines in
the CI system (which makes the data useless from an automated
testing point of view) and most people use x64 these days anyway.
Change-Id: I0fd47bf62087b1e9c45afbd9b5c22f27c8bab12b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jan Arve Saether [Tue, 10 Mar 2015 12:29:51 +0000 (13:29 +0100)]
lupdate: Remove wrong error message
For qsTr(), when string is not literal we printed a warning saying
"text to translate must be a literal string". This was not correct, as
it has never been a requirement for the string to be a _literal_ string.
The solution is to remove the message entirely.
Task-number: QTBUG-42381
Change-Id: If08726143c810382feb0a1c5db5036d9601ce488
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Thiago Macieira [Sun, 8 Mar 2015 00:08:43 +0000 (16:08 -0800)]
Designer: fix const correctness in old-style casts
Found by GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c95d489992d9ef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thomas Hartmann [Tue, 10 Mar 2015 13:58:53 +0000 (14:58 +0100)]
Fix lupdate for .ui.qml files
The context has to be the complete base name including ".ui".
Task-number: QTBUG-44905
Change-Id: If2b148d4ecc790182a7bcc56dd17a33c4ee16617
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Alexander Volkov [Thu, 5 Mar 2015 16:11:51 +0000 (19:11 +0300)]
Assistant: Fix an export and an import of bookmarks
Use the correct root index for BookmarkModel.
Allow to remove top-level bookmark folders if they were
created by importing bookmarks.
Task-number: QTBUG-44042
Change-Id: I423b141d0e64dec8c4cebfdba0d4401d575d1b96
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Albert Astals Cid [Mon, 24 Nov 2014 22:57:48 +0000 (23:57 +0100)]
Fix warning in correct uses of QCoreApplication::translate
It was emitting the warning for "Unsupported Latin1" in the case it was
a valid plural form too
Change-Id: I22c9c15d50488810e3ff5d7b132aebd994b08ebf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Sergio Ahumada [Wed, 4 Mar 2015 21:42:16 +0000 (22:42 +0100)]
Doc: Replace qt-project.org/doc with doc.qt.io
Change-Id: I9f17221f474e06be83a4d9e076746fa3db71d147
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Samuel Gaist [Wed, 4 Mar 2015 20:16:50 +0000 (21:16 +0100)]
Fix kmap2qmap build on OS X
Currently kmap2qmap fails to build on OS X (clang) This patch aims to
fix this.
Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Frederik Gladhorn [Tue, 3 Mar 2015 17:16:39 +0000 (18:16 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ie55561b4d56f23200eda2cc9d2152ae719f2a906
Samuel Gaist [Fri, 27 Feb 2015 07:54:42 +0000 (08:54 +0100)]
Update/add missing parts to build makeqpf
In its current state makeqpf is not buildable. This patch adds the
missing files as well as update the code to use version 2
Change-Id: Idd35a5db5edeef5523b588b919cebebfcdbeaa27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Friedemann Kleint [Thu, 26 Feb 2015 13:26:39 +0000 (14:26 +0100)]
Assistant/helpbrowsersupport.cpp: Remove hostile character.
Fix qdoc-warning:
qttools/src/assistant/assistant/helpbrowsersupport.cpp:1: warning: Hostile character 0xbf in C++ source
Change-Id: If565d8af3502504c5e8b9e2ca70fc439a758e9e0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Friedemann Kleint [Wed, 25 Feb 2015 15:30:50 +0000 (16:30 +0100)]
Change copyright in version dialogs to 'The Qt Company Ltd.'
Change-Id: I7f1d079dc3714685c4d34fad6c237798ca747b1c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Friedemann Kleint [Fri, 20 Feb 2015 11:12:20 +0000 (12:12 +0100)]
windeployqt: Turn off debug/release matching for WebEngine plugins.
Its plugins (ffmpegsumo.dll) are always wrongly detected as debug
builds.
Change-Id: I17ad353a58c90368ab2bc96704016910071f3950
Task-number: QTBUG-44331
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Oswald Buddenhagen [Mon, 23 Feb 2015 10:56:15 +0000 (11:56 +0100)]
Merge dev into 5.5
Change-Id: I3bf7a2f27c34ac77198aabcb57f3ad7df5970649
Frederik Gladhorn [Sun, 22 Feb 2015 15:09:45 +0000 (15:09 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Frederik Gladhorn [Fri, 20 Feb 2015 14:59:14 +0000 (15:59 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df
Friedemann Kleint [Wed, 18 Feb 2015 08:02:48 +0000 (09:02 +0100)]
windeployqt: Fix g++ warning about unhandled enumeration value WinCE.
Change-Id: I2bd95f058c9c03b45ccf43a6f9c6736fed036286
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Sune Vuorela [Sun, 15 Feb 2015 21:51:44 +0000 (22:51 +0100)]
Change creation date to a fixed date
Encoding the dates makes reproducing the output impossible, and doesn't
really have much gain. It most of the time not relevant when something
was built, but more 'what was built' and 'with what tools was it built'
In this case, the creation date isn't read by any thing, so it is likely
just filler data.
Keep the key anyways to not break any third party readers of the file
and set a fixed date, in this case the same date as used for a fixed
date in QtCore's QLibraryInfo::buildDate function at noon.
Change-Id: I560e43dfce538e2f25c3cf51482b946a7cfa179e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Frederik Gladhorn [Mon, 16 Feb 2015 14:23:22 +0000 (15:23 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
Change-Id: Icd2e3843fbf9906454e8e3aa3ac46b21bae3c306
Antti Kokko [Fri, 13 Feb 2015 09:48:10 +0000 (11:48 +0200)]
Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Frederik Gladhorn [Tue, 10 Feb 2015 21:28:29 +0000 (21:28 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
Sergio Ahumada [Tue, 10 Feb 2015 10:04:11 +0000 (11:04 +0100)]
Remove duplicate expression on both sides of '||'
Change-Id: I09601b4ed4b5d9c9e3e373508f5413d0858bb414
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Frederik Gladhorn [Tue, 10 Feb 2015 09:35:51 +0000 (10:35 +0100)]
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: Ibde5671a132665726e9a16cdb98bceb9717e45f3
Eskil Abrahamsen Blomfeldt [Mon, 9 Feb 2015 14:16:54 +0000 (15:16 +0100)]
androiddeployqt: Always include platform plugin dependencies
Qt DBus recently became a dependency for the platform plugin,
causing applications to crash on startup when this is missing.
Instead of special casing the GUI dependency, we always add all
dependencies of the platform plugin.
Change-Id: I59d71531f60874ce436af1840656974d58c14661
Task-number: QTBUG-44182
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Alex Henrie [Thu, 29 Jan 2015 02:26:00 +0000 (19:26 -0700)]
Revert "fix catalan plural rules"
This reverts commit
f1e471b561012f90938766c00aefff417593e71f.
I could not find any evidence that any dialect of Catalan has more than
two plural forms, nor could I find any other software project that gives
Catalan more than two plural forms. I personally have never heard or
seen more than two plural forms used in spoken or written communication.
The CLDR seems to agree with this.
[ChangeLog][Linguist][Important Behavior Changes] The plural rules for
Catalan have been fixed, which will invalidate any existing translations
with plurals.
Change-Id: Id71639a75ec970ee3079b468c2628ced710c1c3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alex Henrie <alexhenrie24@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Alex Henrie [Fri, 6 Feb 2015 18:43:56 +0000 (11:43 -0700)]
linguist: Consistently wrap PO file lines to 79 characters
If the space character is not taken into account, some lines are given
one extra character. This makes Qt Linguist wrap them differently from
gettext and produce unnecessarily large diffs when editing files
generated by gettext.
Change-Id: I310d747a8f455d8ca47e882af04b081e9db25f69
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Tim Murison [Sat, 29 Nov 2014 03:10:51 +0000 (22:10 -0500)]
MacDeployQt: Handle absolute paths
Correctly compute 'cdupCount' when macdeployqt is
invoked on an absolute path.
Task-number: QTBUG-42954
Change-Id: Id7939610dfb4468b59fcb9dafc2e5da2b578ddba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Liang Qi [Fri, 30 Jan 2015 09:39:07 +0000 (10:39 +0100)]
lupdate: update the description for -no-obsolete option
Change-Id: I164744863d4e3949301ec1f236a76e4ce14decae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Liang Qi [Thu, 22 Jan 2015 11:43:06 +0000 (12:43 +0100)]
macdeployqt: fix spelling errors in help information
Task-number: QTBUG-44034
Change-Id: Ie4337dc4770dbe542b3980c6d7265e651de0e88f
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Nico Vertriest [Mon, 19 Jan 2015 09:24:50 +0000 (10:24 +0100)]
Doc: linking issues qttools
Added qmake to qdocconf files
Removed link to internal function
Task-number: QTBUG-43810
Change-Id: Ic371681ddff95f09a31b305056997ff76e9c80f3
Reviewed-by: Martin Smith <martin.smith@digia.com>
Frederik Gladhorn [Mon, 19 Jan 2015 13:07:29 +0000 (14:07 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
Oswald Buddenhagen [Fri, 16 Jan 2015 20:07:05 +0000 (21:07 +0100)]
Bump version
Change-Id: Icaf21350a90d6d2568d76cec4cc1bd5a74eaca7d
Oswald Buddenhagen [Fri, 16 Jan 2015 17:05:00 +0000 (18:05 +0100)]
Merge 5.4 into 5.4.1
Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
Marc Mutz [Fri, 9 Jan 2015 20:05:56 +0000 (21:05 +0100)]
generate_ui: make the generated code compile for uic
These includes should also work when compiled for designer.
Change-Id: I1705e47f561589b0deec23dc773408835947c1fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Nico Vertriest [Mon, 12 Jan 2015 13:13:17 +0000 (14:13 +0100)]
Doc: invalid links in linguist
Corrected link to qmake, removed link to lconvert
Task-number: QTBUG-43779
Change-Id: Ieb5bbc0385764bbcff1305ae4f2f2377cf43f464
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Friedemann Kleint [Mon, 12 Jan 2015 15:12:42 +0000 (16:12 +0100)]
qtdiag/Windows: Output GPU information similar to dxdiag.
Task-number: QTBUG-43263
Change-Id: I348a97a843bcfc2339a06f7408dea72e91d9e0d0
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Kai Koehne [Tue, 13 Jan 2015 10:10:30 +0000 (11:10 +0100)]
Bump copyright year to 2015
Change-Id: I953d93b1e6d1cfe01374645fcb50746c91730eba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Volker Krause [Fri, 9 Jan 2015 18:56:04 +0000 (19:56 +0100)]
Add qtplugininfo, a tool to dump plugin meta data.
This is useful when debugging plugin loading issues, especially also when
adding additional custom meta data as it's done by e.g. KDE and GammaRay.
Change-Id: Ib1d5d1f663f1330a263fc3758b98245b388b31f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Nico Vertriest [Tue, 23 Dec 2014 13:14:29 +0000 (14:14 +0100)]
Doc: corrected title Using Lupdate
Corrected to "Using lupdate"
Task-number: QTBUG-43537
Change-Id: I2edc7a2470f5652b7e0c97705d96ce7f461db6b8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Bjoern Breitmeyer [Mon, 18 Aug 2014 15:57:21 +0000 (17:57 +0200)]
windeployqt wince adaptions
Let windeploy Qt support wince.
Change-Id: I1835f45e93c1d433b41d78dba8b91ac7be2307c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Simon Hausmann [Fri, 9 Jan 2015 09:38:37 +0000 (10:38 +0100)]
Fix build after commit
9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1b in qtdeclarative
The commit integrates the .pragma and .import parsing in JavaScript files
directly into the lexer. Previously the QML engine had a separate function
for parsing those directives and replacing them with whitespace in the source.
Similarly the code here tried to do the same. Fortunately this is not necessary
anymore as the lexer now understands those directives and unless told otherwise
will simply ignore them.
Change-Id: If9888deb2c82a15d1727f4254d897fc9e7bcb832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Friedemann Kleint [Wed, 7 Jan 2015 09:08:23 +0000 (10:08 +0100)]
windeployqt: Update plugin directory-module associations.
Change-Id: I15d030b03a759aff3c6b0a3d2eb415684e635a07
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Sun, 23 Nov 2014 15:33:12 +0000 (07:33 -0800)]
Remove unused functions
Found by Clang 3.6:
assistant/main.cpp:97:1: warning: unused function 'updateUserCollection' [-Wunused-function]
Change-Id: I3fe006504e848914f38b1c481de13b3d10d1059c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Thu, 18 Dec 2014 02:19:52 +0000 (18:19 -0800)]
Replace Q_STATIC_GLOBAL_OPERATOR with static
This existed only for working around an RVCT compiler bug. Let's assume
anyone still using that compiler has upgraded to a version that has the
bug fixed.
Change-Id: Iee4e39893b68ea3f8a8d158229a93e741069b617
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Friedemann Kleint [Wed, 7 Jan 2015 08:30:52 +0000 (09:30 +0100)]
Add missing includes.
After qtbase/
90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.
Change-Id: Ib10622b0da3b3450d29fc65dc5356fde75444a8f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Eskil Abrahamsen Blomfeldt [Tue, 6 Jan 2015 09:23:43 +0000 (10:23 +0100)]
androiddeployqt: Remove unused variable
Just remove a dead variable assignment.
Change-Id: I6034b8a5c462d30449ac7d02b6e6bc1dec109156
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Eskil Abrahamsen Blomfeldt [Tue, 6 Jan 2015 08:43:19 +0000 (09:43 +0100)]
androiddeployqt: Don't bundle QML files in project
Sometimes qmlimportscanner will generate dependencies on files
local to the QML root path. This happens specifically when
you have an
import "../"
in one of your files. Since the files in the input project are
already installed in some way, we don't need to include them under
assets, so we skip these files.
[ChangeLog][Android] Fixed bug where androiddeployqt would
automatically bundle some QML files in your input project
along with their dependencies.
Change-Id: I186df8213024100e5e9ee862eadb3ca568fa6dea
Task-number: QTBUG-43573
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Alexander Volkov [Mon, 22 Dec 2014 11:21:41 +0000 (14:21 +0300)]
Remove qBinaryFind usage from Qt Assistant.
It was omitted in commit
49998cea897fa4c5d410ce07bd53f0d1ee0fd180
(QtAlgorithms is getting deprecated).
Also remove the overload of operator<() which becomes unused with
std::lower_bound().
Change-Id: Iaee3c464e3107c8c3c34def9fa762f22dbd8d510
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Nico Vertriest [Fri, 2 Jan 2015 12:41:16 +0000 (13:41 +0100)]
Doc: moved doc D-Bus Viewer from qttools to qtbase
Inserted in patch 102784 into qtdbus-index.qdoc
in qtbase
Task-number: QTBUG-43537
Change-Id: I6142aabe7675dd401de950958d20952e63a3ee4b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Frederik Gladhorn [Mon, 29 Dec 2014 15:18:07 +0000 (16:18 +0100)]
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Dmitry Shachnev [Wed, 24 Dec 2014 12:40:39 +0000 (15:40 +0300)]
Remove qtconfig from the repository.
We are not going to build/ship it, anyway.
http://lists.qt-project.org/pipermail/development/2014-December/019545.html
Change-Id: Iad58f384550b2379faebc9542baf94459204c175
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>