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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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
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 [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: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>
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>
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>
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>
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>
Friedemann Kleint [Mon, 29 Sep 2014 08:26:11 +0000 (10:26 +0200)]
Qt Designer: Add QOpenGLWidget.
Change-Id: Ia20e63c1427af954c04d0a6c384802fabc2e7bfd
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Friedemann Kleint [Fri, 26 Sep 2014 12:20:03 +0000 (14:20 +0200)]
windeployqt: Deploy software rasterizer for dynamic Open GL builds.
Change-Id: I0bb260c7c8992ae24dda6f84eaf304329eb4159c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Simon Hausmann [Fri, 26 Sep 2014 11:09:22 +0000 (13:09 +0200)]
Removed run-time library for the QML compiler
This library is not needed anymore for the release with Qt 5.4
Change-Id: Ia3e361405f73f2f3da025475aa440c8b93398850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Morten Johan Sørvig [Tue, 6 May 2014 09:22:19 +0000 (11:22 +0200)]
Improve how macdeployqt calls qmlimportscanner
Construct the argument list using "-rootPath", which
correctly handles multiple qmlDirs. Don't merge
qmlimportscanner stdout and stderr. Log stderr as
macdeployqt warnings.
Change-Id: I6f82f90f4e242c9aa246ab26ba3b9af88e1fd123
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Antti Kokko [Fri, 22 Aug 2014 06:26:35 +0000 (09:26 +0300)]
Update license headers and add new license files
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL
Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Jocelyn Turcotte [Tue, 23 Sep 2014 14:29:28 +0000 (16:29 +0200)]
Zoom the documentation according to the system DPI by default
QtWebKit follows the web standard use of 96 DPI for font sizes and
this is a good compromise for the web, but this would require each
Assistant user to zoom the text manually without the benefit of
keeping existing content working (since we don't show any external
content in Assistant that could break with a higher DPI).
HiDPI on OS X already handles the issue by scaling the whole page by
two, but since we don't completely support DPI awareness on Windows,
Assistant assets and text will be scaled but the documentation
itself will be microscopic.
Use the zoomFactor to adjust the DPI according to system settings
by dividing QScreen::logicalDotsPerInch() by 96.
Task-number: QTBUG-41076
Change-Id: I5644d0b383fcaf04bed156207afca9b322ea18a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Friedemann Kleint [Wed, 24 Sep 2014 13:00:22 +0000 (15:00 +0200)]
Qt Designer: Fix range check of double properties.
Change-Id: I18348c0e354a8dd9306d40557700e34225c21014
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Alexander Volkov [Fri, 19 Sep 2014 12:22:53 +0000 (16:22 +0400)]
qdbusviewer: Extract MainWindow class
This refactoring is a preparation for saving/restoring window settings.
Change-Id: I22b4c4947437e90f986390a4dd7c14d50a0f02d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
BogDan Vatra [Sat, 20 Sep 2014 08:23:06 +0000 (11:23 +0300)]
Make sure the outputDirectory contains the full path not relative.
Trying to run a process using the relative path on windows fails.
Task-number: QTBUG-41431
Change-Id: I0c9aa837dc7a556372b1018feb2f7f5c14c2652a
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Sat, 20 Sep 2014 07:58:53 +0000 (10:58 +0300)]
Don't remove assets folder.
The user might copy files in assets folder at install time.
Change-Id: Ib26f6d0546aae70788c09bf455835647e3deb602
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Friedemann Kleint [Fri, 19 Sep 2014 13:37:40 +0000 (15:37 +0200)]
Qt Designer QDesignerContainerExtension example: Fix page title.
Tie the setting of the combo title to QQWidget::windowTitleChanged().
The call to retranslateUi() happens after adding the pages; so
the titles are lost in uic-generated code.
Change-Id: Ia88dd694a7ab5fe1bd62a849feeb7768a2ba6f16
Task-number: QTBUG-24916
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Christian Kandeler [Fri, 19 Sep 2014 11:48:07 +0000 (13:48 +0200)]
Fix crash when accessing the content model.
1) Make sure invalidateContents() is called whenever the help engine's
DB readers are destroyed.
2) In QHelpContentProvider::stopCollecting(), remove all root items, as
they are invalid now: Their child items reference DB readers that
are going to be destroyed.
Task-number: QTBUG-18829
Change-Id: Id9cc4ea99c43c36ad5c5d1f04157a68bac79d44a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Frederik Gladhorn [Thu, 18 Sep 2014 11:13:12 +0000 (13:13 +0200)]
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Frederik Gladhorn [Wed, 17 Sep 2014 18:58:33 +0000 (20:58 +0200)]
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd
Rainer Keller [Wed, 17 Sep 2014 08:51:06 +0000 (10:51 +0200)]
Remove qtdemo from gitignore
QtDemo was removed with a commit in qtdoc.
Change-Id: I4ebbc5825dd3e30652903a459f21ea26d5fd4682
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Frederik Gladhorn [Tue, 16 Sep 2014 13:29:38 +0000 (15:29 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9
Alexander Volkov [Fri, 5 Sep 2014 11:06:28 +0000 (15:06 +0400)]
Assistant: Fix a name of a bookmarks folder
The folder named "Toolbar Menu" is meant to contain bookmarks which
are displayed on the bookmarks toolbar rather than in some menu.
So the name "Bookmarks Toolbar" is more appropriate, besides it is
consistent with Firefox and is similar to Chromium's "Bookmarks bar".
Change-Id: I1b1c359ee4ca02dcd34afff01326442c5d9b4459
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Eskil Abrahamsen Blomfeldt [Mon, 8 Sep 2014 14:52:54 +0000 (16:52 +0200)]
Android: Make search for import path case insensitive on Windows
The file system is case insensitive on Windows, and if you e.g.
specified a lower case drive letter in your prefix when building
Qt, then we would bail out because we would think the path
of any given import was located outside the import paths specified.
Task-number: QTBUG-41012
Change-Id: I22a1be32a221cd754dfed93e125d685bade65828
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Oswald Buddenhagen [Mon, 4 Aug 2014 19:21:24 +0000 (21:21 +0200)]
fix context checkmarks
not such a good idea to not count finished messages towards non-obsolete
ones.
amends
9d3cbd0a.
Task-number: QTBUG-34921
Change-Id: I22d0dd14c094a33973635c23e59c66d72c6c746a
Reviewed-by: hjk <hjk121@nokiamail.com>
Kai Koehne [Wed, 3 Sep 2014 14:11:34 +0000 (16:11 +0200)]
Update copyright year in About dialogs
Change-Id: I4c911c809c3779f7ac59917d5d88a38628817f67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Mon, 1 Sep 2014 11:58:13 +0000 (13:58 +0200)]
windeployqt: Special case non-standard modules.
Task-number: QTBUG-40670
Change-Id: I3897b4149587cf4e90cbdaf6d54ef8cff70d22d2
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Oswald Buddenhagen [Mon, 4 Aug 2014 20:07:36 +0000 (22:07 +0200)]
remove pointless empty column in message list
the view has one column less than the context list, so reflect that in
the model.
Change-Id: I51c87167bc334b47e4a35874a476823db4908790
Reviewed-by: hjk <hjk121@nokiamail.com>
Friedemann Kleint [Thu, 28 Aug 2014 14:11:32 +0000 (16:11 +0200)]
windeployqt: Detect Quick applications by checking Qt5Quick[d].dll.
Applications no longer have a direct dependency to Qt5Qml[d].dll.
Task-number: QTBUG-40663
Change-Id: I2b3569c3d39f6a96e3f44d6e2541c6697c93bd7f
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Frederik Gladhorn [Fri, 29 Aug 2014 09:33:45 +0000 (11:33 +0200)]
Bump version
Change-Id: Ib882880ca853660bdd3cd6388d4e94b020e87ce3
Frederik Gladhorn [Thu, 28 Aug 2014 14:19:02 +0000 (16:19 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I5ce2fc73aa2b5b3d1c7e2108105c32cb810cd6bf
Samuel Gaist [Tue, 24 Jun 2014 22:47:51 +0000 (00:47 +0200)]
macdeployqt: don't use hardcoded lib/ when searching for dylib
Currently when parsing otool output for dylibs, "lib/" is appended to
the path. However dylibs might not be always found in a lib folder like
e.g. the mysql client libraries from macports. This patch aims to remove
that hardcoded path and use the data from the currently parsed otool
line.
[ChangeLog][OS X][macdeployt] Fixed a bug where dynamic libraries where
searched in the wrong directory
Task-number: QTBUG-21913
Change-Id: I992d15bc48ad827185216852108b2d0a5633043e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>