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>
Alexander Volkov [Fri, 24 Oct 2014 12:44:44 +0000 (16:44 +0400)]
Assistant: Fix high CPU usage if a parent process finishes
If Assistant has been started in the remote control mode in Linux
and it's parent process finishes, then Assistant increases CPU load
to 100% and continuously raises it's window.
It is because QSocketNotifier for stdin continuously emits
activated() signal although there is no data to read.
So disable the notifier after receiving EOF.
Change-Id: I1b01108e1b97bc4fd54411b16489082be7f47bf4
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Alexander Volkov [Fri, 24 Oct 2014 12:24:37 +0000 (16:24 +0400)]
Assistant: Extract StdInListener class from RemoteControl
Also rename StdInListenerWin to StdInListener and select
the needed version during compilation.
Change-Id: I4ef45feee71bae47ef3dfb63e91b7e3154886006
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
BogDan Vatra [Fri, 19 Dec 2014 10:29:38 +0000 (12:29 +0200)]
Make sure we are using gradle 2.x
Google is playing with my nerves! Android SDK Tools v24.0.0 set gradle
1.x by default, then in v24.0.1 they've switched to gradle 2.x.
Incredibly, a few days later they're released v24.0.2 and again they've
switched back to gradle 1.x as the default gradle version. Thought, when
a project is opened in Android Studio, Android Studio switches to gradle
2.x. We'll do the same thing in androiddeployqt.
Change-Id: Id5ca3f94a96b230cbb6af410bccf292d53f9ea5b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Thiago Macieira [Thu, 18 Dec 2014 02:43:00 +0000 (18:43 -0800)]
Solve warning about unused function
The function is unused, but gets used when developers are doing
debugging. So instead of removing it completely, make it inline
non-static.
I've also moved it to a better place, so we don't forget about it.
Change-Id: Id751869e6d6a7d46b4985ef9c09f45661e8cf839
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Thiago Macieira [Thu, 18 Dec 2014 02:11:55 +0000 (18:11 -0800)]
Remove workaround for RVCT compiler bug
We have no idea if anyone is still using that compiler. But let's assume
that they are using a more modern version that does not have the same
bug that we faced with Symbian in 2010.
Change-Id: I1d25d05d6ecbf531d4942e696470db689c55eeea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Friedemann Kleint [Thu, 18 Dec 2014 08:07:34 +0000 (09:07 +0100)]
windeployqt: Put translations into subdirectory "translations".
Add translationsDirectory member variable defaulting to
target + "/translations" (matching the default location of
qt.conf) to options and put Qt's and WebEngine's
translations there.
[ChangeLog][Important behavior changes][windeployqt]
windeployqt now puts translations into subdirectory "translations".
Task-number: QTBUG-43351
Change-Id: Ib1173f9dd7ca029d9dcb58c89a53bba43b22ec99
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Frederik Gladhorn [Wed, 17 Dec 2014 15:57:07 +0000 (16:57 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ifbda2445e6665d66a1372f6c0a2d0a1c30ae029d
Oswald Buddenhagen [Mon, 20 Oct 2014 18:43:48 +0000 (20:43 +0200)]
work around MSVC2010 ICE
Task-number: QTBUG-43394
Change-Id: Ifffcc0cf9109b76d79f603a13792d7fd9979761c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/
87eb3ea1904756362ce5474838b25b5b00193dc5)
BogDan Vatra [Fri, 12 Dec 2014 14:02:13 +0000 (16:02 +0200)]
Make sure gradlew has exec permissions on *NIX systems.
Change-Id: Icfe2278bf697e4a2e342c6a1d16339bfa674acd4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Topi Reinio [Tue, 16 Dec 2014 11:10:53 +0000 (12:10 +0100)]
Doc: Add install path for examples
Several documentation submodules were missing the correct
install path in the doc configuration.
This change will enable the examples to be listed under
the Qt Creator Welcome mode.
Change-Id: I15554d68f6a5c1741756ab4581050420ecd10cc2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Friedemann Kleint [Tue, 16 Dec 2014 08:09:43 +0000 (09:09 +0100)]
Designer: Use QWidget::save/restoreGeometry() to position resource dialogs.
Using QRect as was done before might cause the dialogs to be
restored out of screen if a screen is removed from a multimonitor
setup.
Task-number: QTBUG-43374
Change-Id: I48bb6e747da8042a8433d26e5e3bed267126ed3b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Oswald Buddenhagen [Fri, 12 Dec 2014 12:48:52 +0000 (13:48 +0100)]
Bump version
Change-Id: Ie1e2dd433215df1037accc0cef807b009272a40c
Alexander Volkov [Mon, 22 Sep 2014 12:12:45 +0000 (16:12 +0400)]
qdbusviewer: Restore the window size and state on startup
Save the window size, maximization state and state of splitters
on exit and restore these settings on startup.
Change-Id: Ibe26b09cc97ffc2fef17e6e8e2b804324dae7002
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Christian Strømme [Wed, 3 Dec 2014 14:12:36 +0000 (15:12 +0100)]
Android: Don't bail out if qmlimportscanner is missing.
If the qmlimportscanner is missing, just print the warning and continue,
as it's most likely that the application is a non-qml application.
Change-Id: Ice8b4f11df3df558555fbd3ac373561ce6fb4896
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Friedemann Kleint [Fri, 28 Nov 2014 09:18:38 +0000 (10:18 +0100)]
Assistant: Introduce DEFINES per browser type.
This makes it easier to add additional browser types and
switch between browsers.
Task-number: QTBUG-41130
Change-Id: I88e2890bfe9e815ed7deb9d867060f244b7e2a45
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>
Friedemann Kleint [Thu, 27 Nov 2014 15:19:02 +0000 (16:19 +0100)]
Assistant: Factor out web browser support.
Task-number: QTBUG-41130
Change-Id: Ia1d29b6eaa56e0f9eb569326e05f4c56411db6a7
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Friedemann Kleint [Tue, 9 Dec 2014 07:37:57 +0000 (08:37 +0100)]
Revert "Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin."
Re-enable the QDeclarativeView plugin.
This reverts commit
a60aa90f5ca00e32a1271a476f5da650dddebfda.
Task-number: QTCREATORBUG-10273
Task-number: QTCREATORBUG-13616
Task-number: QTBUG-35006
Change-Id: Id8c34e040508f7509501533eceaa75613a46baa8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Friedemann Kleint [Fri, 28 Nov 2014 16:30:40 +0000 (17:30 +0100)]
Designer: Do not filter out wheel events on form containers.
Otherwise, scrolling with the mouse wheel over the form no longer
works.
Task-number: QTBUG-42927
Change-Id: Ib9022bd3c8e158ca10965602c134415c5c4f7039
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Frederik Gladhorn [Thu, 27 Nov 2014 17:29:07 +0000 (18:29 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: If3345bc6090bac3cddf98c6eed68f47686a3ee75
Frederik Gladhorn [Thu, 27 Nov 2014 17:04:59 +0000 (18:04 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: Icb5b56853c52d51d2cbb294ce9abb5450e2fa2d4
Thiago Macieira [Sun, 23 Nov 2014 15:50:49 +0000 (07:50 -0800)]
Remove unused private members
Found by Clang 3.6:
messageeditorwidgets.cpp:250:14: warning: private field 'm_wrapee' is not used [-Wunused-private-field]
cpp.cpp:309:15: warning: private field 'yyInteger' is not used [-Wunused-private-field]
Change-Id: Ice6aa515123b1ac375816271362772d50b9b8f27
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Thiago Macieira [Sun, 23 Nov 2014 15:44:17 +0000 (07:44 -0800)]
Fix silly taking of address when not intended
We meant to pass the boolean itself, noting whether the property
had changed, not the address of the boolean, cast to a bool.
Found by Clang 3.6:
qlayout_widget.cpp:421:147: warning: address of 'this->m_fieldGrowthPolicyChanged' will always evaluate to 'true' [-Wpointer-bool-conversion]
Change-Id: I8a7db0d0cf02b88043f905333e119a8fb799ea53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Frederik Gladhorn [Fri, 21 Nov 2014 12:45:22 +0000 (13:45 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9
Jocelyn Turcotte [Thu, 6 Nov 2014 10:42:00 +0000 (11:42 +0100)]
macdeployqt: Also deploy framework's Libraries and Helpers
QtWebEngine can't put all its external data in qrc files and have a few
files lying around in the Qt installation. To allow it to be bundled
with applications, those files are now placed into the QtWebEngineCore
framework.
This patch allows Helpers/QtWebEngineProcess.app as well as
Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an
application linking to QtWebEngine.
This link mention that Libraries is a standard directory:
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
This link mention that Helpers is a standard directory for application
bundles, but I haven't seen any mention regarding frameworks:
https://developer.apple.com/library/mac/technotes/tn2206/_index.html
Task-number: QTBUG-41611
Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857
(cherry picked from commit
5984871db094182b89d2b8e0b142817b227afa4d)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Alessandro Portale [Wed, 19 Nov 2014 16:05:05 +0000 (17:05 +0100)]
New Qt logo
This patch replaces the old Qt logo with the new, flatter one.
The PNGs were optimized via: optipng -o7 -strip "all"
src/assistant/assistant/images/qt-logo.png was deleted since it
is unused.
Task-number: QTBUG-41685
Change-Id: Id04972f87135e15c41d52c5e9f00ad4944d8d1f6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Alex Blasche [Wed, 19 Nov 2014 08:52:18 +0000 (09:52 +0100)]
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: I3492eb21cb47e2a77dc5a79b3ddab8522ac39fea
Jocelyn Turcotte [Thu, 6 Nov 2014 10:42:00 +0000 (11:42 +0100)]
macdeployqt: Also deploy framework's Libraries and Helpers
QtWebEngine can't put all its external data in qrc files and have a few
files lying around in the Qt installation. To allow it to be bundled
with applications, those files are now placed into the QtWebEngineCore
framework.
This patch allows Helpers/QtWebEngineProcess.app as well as
Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an
application linking to QtWebEngine.
This link mention that Libraries is a standard directory:
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
This link mention that Helpers is a standard directory for application
bundles, but I haven't seen any mention regarding frameworks:
https://developer.apple.com/library/mac/technotes/tn2206/_index.html
Task-number: QTBUG-41611
Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Friedemann Kleint [Wed, 12 Nov 2014 11:09:07 +0000 (12:09 +0100)]
windeployqt: Deploy translation files of the QtWebEngine module.
Task-number: QTBUG-42083
Change-Id: Ibc52780c52399ba13cfa5c501b67bd37ea727d1f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Aleix Pol [Mon, 10 Nov 2014 02:26:45 +0000 (03:26 +0100)]
Tolerate an empty android-extra-libs value
Skip the empty fields in the split. It's obvious that "" means nothing,
there's no other way to read the value.
It especially helps with machine-generated versions of the json files.
Change-Id: Idb957d4fa3076e908e5f437807b171f6ec56863c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Eskil Abrahamsen Blomfeldt [Fri, 7 Nov 2014 11:08:12 +0000 (12:08 +0100)]
androiddeployqt: Add --qml-import-paths to help output
This option should also be documented.
Change-Id: Icbcbaea65c839105c8f5a94b5d391bb9e95479ce
Task-number: QTBUG-41494
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Eike Ziller [Thu, 6 Nov 2014 13:58:17 +0000 (14:58 +0100)]
QHelpContentModel: Fix that the model sometimes ended up empty
When aborting collecting the content items, sometimes the "abort" state
was not cleaned up correctly, so the next run thought it was aborted
too. If that happened at the end of the multiple start/abort cycles that
happen at initialization, the content model ended up empty.
Task-number: QTCREATORBUG-13233
Change-Id: Ia47a6b033cc3fd1f7a02d5194fb6f7ea68a435c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Thiago Macieira [Thu, 30 Oct 2014 05:55:53 +0000 (22:55 -0700)]
Q_ASSERT now always expands the argument
We need isDescendant to be defined.
Change-Id: I014c0501d11613c252c3bf2297442e2693708b5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Andrew Knight [Fri, 31 Oct 2014 10:32:33 +0000 (12:32 +0200)]
windeployqt: Add option to skip qmltooling
These plugins should be left out when creating release packages, so add
the option to disable them.
Change-Id: Ic40f861c5c01534aa95a39fca398946eedbb4688
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Mon, 27 Oct 2014 14:40:25 +0000 (15:40 +0100)]
windeployqt: Accept a list of positional arguments.
The first argument can be either a binary or a directory containing
the binary. Further arguments can be either libraries or directories
containing libraries (plugins).
Task-number: QTBUG-41670
Change-Id: I48dd157f6404118400948ef019016c2aa6661762
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Friedemann Kleint [Mon, 27 Oct 2014 14:23:35 +0000 (15:23 +0100)]
windeployqt: Add --release-with-debug-info option..
The option can be used for Qt builds with
-force-debug-info -release .
For those, deployment fails with "Unable to find the platform
plugin." since the DLLs are detected as debug-built. If windeployqt is
extended to actually read Qt configuration information, the value can be
obtained from there.
Task-number: QTBUG-42072
Change-Id: If8b4a0e41821b5f0f4b7023b1b9a3d49e50628a1
Reviewed-by: Jarred Nicholls <jarred.nicholls@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Eskil Abrahamsen Blomfeldt [Mon, 27 Oct 2014 14:54:42 +0000 (15:54 +0100)]
androiddeployqt: Fix dependency order for XML dependencies
Although this bug was there in Qt 5.3 as well, something has changed
in our build system that causes readelf to return libraries in a
different order than before. In particular, the QtMultimedia dependency
is now listed before QtQuick if it's listed first in the QT variable in
the .pro file. This caused the following bug:
When we read the manual dependencies from the XML specification,
then we assume the dependencies of these are already met (otherwise
they should not be added). Therefore, we need to load these
dependencies last, not intermingled with the actual direct
dependencies of the application.
What would happen is that Qt5Multimedia came before Qt5Quick, and
triggered adding Qt5MultimediaQuick_p before Qt5Quick. This of course
depends on Qt5Quick so it needs to be added after it (which is why
it is only added if the application itself depends on Qt Quick).
Change-Id: Ifa97d85645cff49ebf65d4ce3fc2101506346695
Task-number: QTBUG-42012
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Friedemann Kleint [Mon, 27 Oct 2014 15:06:07 +0000 (16:06 +0100)]
windeployqt: Make check for Qt modules more discriminative.
Qt Creator's QtcSsh.dll is not a Qt module.
Change-Id: I3349724a5d64d1662480d053369768fbbd54b3bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Friedemann Kleint [Mon, 27 Oct 2014 10:29:49 +0000 (11:29 +0100)]
Remove the Qt Designer arthurplugin example.
The example accesses code from the qtbase, which does not work.
Task-number: QTBUG-28147
Change-Id: I842080eee5b0ea5ed1da6a4e08ae3d6e9f9ead5f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Frederik Gladhorn [Mon, 20 Oct 2014 17:13:53 +0000 (19:13 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ib8043f1dce5bcb3999965b91d3d7522fd1289eb0
Friedemann Kleint [Mon, 20 Oct 2014 07:16:22 +0000 (09:16 +0200)]
windeployqt: Add missing include.
Change-Id: Id309f777a04b03fc9db099477fe83d4d80bfe495
Reviewed-by: David Schulz <david.schulz@digia.com>
Alexander Volkov [Thu, 18 Sep 2014 13:56:56 +0000 (17:56 +0400)]
Assistant: prevent the main window from jumping during startup
Remove the 6 year old hack which causes an early show of the main window.
Change-Id: I1c8d782b3ecd7278068b5a21d34fef937585f25d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Alexander Volkov [Thu, 18 Sep 2014 14:31:40 +0000 (18:31 +0400)]
Assistant: Make "Bookmarks Menu" the default bookmarks folder
Assistant doesn't show the bookmarks toolbar by default so it's more
reasonable to preselect the "Bookmarks Menu" folder when a user adds
a bookmark.
Change-Id: If1b92c1decb280e96e5c58a56d6948eec6e44813
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Friedemann Kleint [Mon, 6 Oct 2014 11:26:39 +0000 (13:26 +0200)]
Qt Designer: Use QCommandLineParser.
Change-Id: I301066eaa52d0b6b6416ee5188fda93763ada4bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Frederik Gladhorn [Thu, 16 Oct 2014 10:13:13 +0000 (12:13 +0200)]
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Marc Mutz [Wed, 8 Oct 2014 23:43:05 +0000 (01:43 +0200)]
uic: don't use QStringLiteral in comparisons
For QLatin1String, operator== is overloaded, even for QStringRef,
so comparing to a latin-1 (C) string literal is efficient,
since strlen() is comparatively fast.
OTOH, QStringLiteral, when not using RVO, litters the code with
QString dtor calls, which are not inline. Worse, absent lambdas,
it even allocates memory.
So, just compare using QLatin1String instead.
Change-Id: Ice92d40342cb3939e8697d3f778f4421f5f967a1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Wed, 8 Oct 2014 23:38:50 +0000 (01:38 +0200)]
generate_ui: adapt to upstream change in qtbase
Change
106487387d493dab934e19b33bfed55b8df62d67 in qtbase
removed a few ? true : false, some of them happened to be
in uic's generated code.
Adapt the generator.
Change-Id: I1c5aefef57e3d17aaef3c1eee4ce92730499b4df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Frederik Gladhorn [Tue, 14 Oct 2014 12:08:40 +0000 (14:08 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/assistant/assistant/mainwindow.cpp
src/linguist/linguist/mainwindow.cpp
src/qdbus/qdbusviewer/qdbusviewer.cpp
Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
Alexander Volkov [Fri, 19 Sep 2014 09:52:42 +0000 (13:52 +0400)]
Assistant: Fix index updating on startup in the remote control mode
HelpEngineWrapper::initialDocSetupDone() should be called only once
right after the initialization of the help models. Calling it on
every small update leads to recursion.
Task-number: QTBUG-36850
Change-Id: I16cae03f08bbc9a19ec9298c84c602a4046dce93
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Frederik Gladhorn [Thu, 9 Oct 2014 16:09:54 +0000 (18:09 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ie652f78d8dc47ccaa3628205592a17045badef7f
Friedemann Kleint [Thu, 9 Oct 2014 12:54:55 +0000 (14:54 +0200)]
Update copyright year in "About" dialogs to 2014.
Change-Id: Ia9807bc783d3f83ab1556faeb3fa73af3be4505d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Marc Mutz [Wed, 8 Oct 2014 23:22:30 +0000 (01:22 +0200)]
uic4: update sources from current generate_ui
Change-Id: I4fa0490162fdef4b65ce8fccea731810262e6a97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 2 Oct 2014 11:02:46 +0000 (13:02 +0200)]
Android: Support recursive ANDROID_DEPLOYMENT_DEPENDENCIES
The convenience of ANDROID_DEPLOYMENT_DEPENDENCIES would be
greatly increased if you could include a directory and have its
contents be added recursively to the deployment, instead of
listing each file individually.
Change-Id: I3cf3248007369122ea6ba98ab79f7f2f951a26c3
Task-number: QTBUG-41674
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Jake Petroules [Tue, 16 Sep 2014 05:29:06 +0000 (01:29 -0400)]
macdeployqt: fix checking for existing deployed files.
Change-Id: I53c44256e33f3b5d7db93b4765308335a11e8ecd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Mon, 29 Sep 2014 07:28:52 +0000 (09:28 +0200)]
windeployqt: Add support for QtWebEngine.
Change-Id: I92d8d5271c0dc53cc37ea6f699e75ab91ad0cf3a
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Friedemann Kleint [Mon, 6 Oct 2014 08:28:36 +0000 (10:28 +0200)]
Qt Designer: Load translations only when designer_<LANG>.qm is present.
Try to load designer_<LANG>.qm first and load qt_<LANG>.qm only
if the former succeeds.
Task-number: QTBUG-41790
Change-Id: Id4862019edf81da81bf9d059c586bbfee18ab7e6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Christian Kandeler [Fri, 26 Sep 2014 10:15:59 +0000 (12:15 +0200)]
Make sure the content widget never replaces valid data with empty data.
This could happen because insertContents() is called once for
every run of the content provider, even if an invalidation happens
in between. Example sequence:
run()
invalidate() [removes result of first run]
run()
insertContents() [queued for first run, retrieves result of second run]
insertContents() [queued for second run, retrieves empty data]
We now check in insertContents() whether the content provider has a
valid root item and do nothing if it does not. This means that
insertContents() will never replace the current model data with empty
data; only invalidateContents() can do that from now on.
Further improvements:
- Only call insertContents() if the run was not aborted; this
reduces the number of useless objects in the event queue.
- Remove the m_rootItem member; it was only used in the run() function.
- Only add the root item to the list at the end of a successful run;
there is no reason this object should be accessible from the outside
while there are still children being added to it.
Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Friedemann Kleint [Mon, 29 Sep 2014 12:13:28 +0000 (14:13 +0200)]
windeployqt: Use Qt5Gui.dll to detect ANGLE/OpenGL.
After the introduction dynamic GL loading, the platform plugin no
longer directly depends on the GL libraries.
Change-Id: Icd3a5836fff52071df33a5ad87dea528c11ee83c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Morten Johan Sørvig [Thu, 25 Sep 2014 06:20:01 +0000 (08:20 +0200)]
Prevent re-deploying already deployed imports.
Check if the target directory exists before copying
the import.
Change-Id: Id729f26b4b887c7a3b209aa88649eca3fc73b0ba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Wed, 24 Sep 2014 21:12:45 +0000 (23:12 +0200)]
Work around legacy framework structures.
Existing versions of qmake produce application bundles
which are incompatible with OS X code signing.
Deploy framework Info.plist files to the correct
location. Patch them to remove any "_debug" suffix
on the value for CFBundleExecutable.
Task-number: QTBUG-32896
Change-Id: Id657e394f3bf919713a43e395e716bf46488c644
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Wed, 24 Sep 2014 20:35:27 +0000 (22:35 +0200)]
Make deployed Qt Quick imports code signable
The OS X code signing process enforces strict code/data
separation. Split up the Qt Quick imports; deploy
.dylibs to "Contents/Plugins/quick/", deploy .qml files
and other resources to "Resources/". Create symlinks
to the dylibs so that Qt Quick can load the imports
as usual.
Task-number: QTBUG-34810
Change-Id: If7e1f80b357598c8e3cc7dd46a9363387218d541
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Wed, 24 Sep 2014 13:08:00 +0000 (15:08 +0200)]
Add -codesign option.
Use the "codesign" tool with the provided signing identity to
sign all code binaries in the bundle. Application code binaries
include the app executable(s), plugin and framework/dylib
dependencies.
Finally, run "codesign --verify" to verify that the app
bundle is correctly signed.
Change-Id: Idfff030a2b218e1dc1ad1bc279a32a330665b347
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Wed, 24 Sep 2014 10:06:47 +0000 (12:06 +0200)]
Fix framework bundle deployment
Rework copyFramework(). Split out dylib deployment
into copyDylib(). Remove the special symlink handling.
Always create symlinks from "Current" to the actual
version.
This ensures we're compatible with Apple's framework
bundle spec [1]. It also makes the 'codesign' utility
happy, easing the step to sandbox Qt OS X applications.
[1]: https://developer.apple.com/library/mac/documentation/
macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
Task-number: QTBUG-32896
Change-Id: Ide23437c9bb6515d5013d37ae6ff4133a69085ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>