Johanna Aijala [Thu, 21 Feb 2013 07:38:02 +0000 (09:38 +0200)]
Merge branch 'stable' into release
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
Timo Jyrinki [Fri, 8 Feb 2013 07:11:47 +0000 (09:11 +0200)]
Add license files mandated by (L)GPL.
Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.
These files were wget:d from:
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL
As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.
File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL
Change-Id: Ia9dd91fb4defea000d3df79006eba65e549a99e1
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Friedemann Kleint [Thu, 14 Feb 2013 07:46:54 +0000 (08:46 +0100)]
Add Linguist comments to palette editor preview widget.
Change-Id: Ib2cffaddacdddcc84070310a7f8e7c387ef3972a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Stephen Kelly [Tue, 12 Feb 2013 20:06:33 +0000 (21:06 +0100)]
Remove QPointerBase bic check.
QPointerBase is not public or exported and it is to be removed
Change-Id: I91d9cfc14db7e5bf1fe85279734e04486b3b483e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jerome Pasion [Tue, 12 Feb 2013 16:24:51 +0000 (17:24 +0100)]
Doc: Edited Qt Help page and clarified .qhp file location.
-replaced "html" with "HTML"
-noted that the .qhp files are in the HTML directories
Task-number: QTBUG-29576
Change-Id: I0ba1c9534d730648c25dcdf15fcb1448fa9eb8fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
kh1 [Mon, 11 Feb 2013 12:26:07 +0000 (13:26 +0100)]
Ctrl+W shortcut on last open tab causes Assistant to crash.
Task-number: QTBUG-29499
This happend as nobody did inform the menu about the page changes,
the shortcut remained active even for the last viewer. Also make
some constructors and functions private, so we can no longer mess
from the outside with the viewers, except thru OpenPagesManager.
Change-Id: I2675996d4b30ab8b1db657e5157b497a73b96196
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Friedemann Kleint [Mon, 11 Feb 2013 08:40:28 +0000 (09:40 +0100)]
Fix CONFIG of tool-plugins.
Change-Id: I09c9abb08ba9f1ba171bf468e6cbc9010aaf0b53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
hjk [Tue, 22 Jan 2013 10:00:20 +0000 (11:00 +0100)]
QMakeParser: save one ByteArray construction
Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from qtcreator/
52be02d1cbbf69d4f82c517c7b633ed3d13b1007)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Orgad Shaneh [Tue, 8 Jan 2013 01:32:53 +0000 (03:32 +0200)]
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from qtcreator/
29a93998df8405e8799ad23934a56cd99fb36403)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 30 Jan 2013 17:11:56 +0000 (18:11 +0100)]
fix doc page urls
they are versioned nowadays
Change-Id: I136d9073acd9f2c19d1b41ed1d071250c8e86048
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
kh1 [Thu, 31 Jan 2013 14:54:07 +0000 (15:54 +0100)]
Do not use webkit in case of static build.
Since linking against a statically build qtwebkit fails, fallback to
use QTextBrowser. I guess we need to fix static webkit builds first.
Change-Id: I1bc6c1ae70f0e57fa179a3ffe8750bde97809d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Wed, 6 Feb 2013 11:21:11 +0000 (12:21 +0100)]
Qt Designer: Fix message about file open failure.
Change-Id: Ic59e7fc11c9a67546a22901b82681dd75831455a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 30 Jan 2013 16:41:47 +0000 (17:41 +0100)]
substitute fixed version numbers in qdocconf files with variables
Change-Id: Ib53e90616e5dc98d6fbfdef5172eb96216a6a60e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Fri, 1 Feb 2013 19:03:02 +0000 (20:03 +0100)]
support alternative and multiple suffixes in $$resolve_depends()
this is undeniably a new feature, but it's needed for a bugfix.
Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
87054805872429c1c17135f9ae5364b050d3fdff)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Wed, 30 Jan 2013 17:37:11 +0000 (18:37 +0100)]
don't flush qmake command line twice
otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.
Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
864e1ceaf628e823103ae2d28d2c983400ba38c7)
Debao Zhang [Fri, 21 Dec 2012 02:24:44 +0000 (10:24 +0800)]
qmake:Add a case sensitivity flag to ProString::{starts,ends}With()
Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Joerg Bornemann [Mon, 17 Dec 2012 11:56:02 +0000 (12:56 +0100)]
add base parameter to ProString::toInt and ProString::toShort
Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Sergio Ahumada [Fri, 1 Feb 2013 10:17:13 +0000 (11:17 +0100)]
Merge "Merge branch 'release' into stable" into refs/staging/stable
Friedemann Kleint [Fri, 1 Feb 2013 08:34:41 +0000 (09:34 +0100)]
QtDBus-tools: Remove module includes.
Change-Id: I4b6754c7bd513a2c479c52a0428bd7eee857c6ca
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Sergio Ahumada [Thu, 31 Jan 2013 15:08:06 +0000 (16:08 +0100)]
Merge branch 'release' into stable
Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7
kh1 [Thu, 31 Jan 2013 09:38:49 +0000 (10:38 +0100)]
Look into the right variable to determine whether Qt is built statically.
Change-Id: I2a9a6613bad5de19fadc0361eda3fe7dbb4b0a44
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Wed, 30 Jan 2013 13:34:34 +0000 (14:34 +0100)]
FilterWidget: Fix valgrind warning about uninitialized variable.
Change-Id: I7ae99af02d5d61626eac97ddb8a6f62da9c2d638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
kh1 [Tue, 29 Jan 2013 13:58:03 +0000 (14:58 +0100)]
Fix crash (QFont access) by using a qt gui application.
Task-number: QTBUG-29218
Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Andy Shaw [Thu, 24 Jan 2013 20:03:13 +0000 (21:03 +0100)]
Use path() as we need the path without the filename
On Windows, filePath() was used for a function that was supposed to get
the bin directory for Qt. However path() should be used instead as this
will remove the filename from the originally obtained string.
Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Sergio Ahumada [Wed, 9 Jan 2013 19:42:44 +0000 (20:42 +0100)]
Update changes file for 5.0.1 release
Change-Id: If70f67f3b8f9a2230cccff8a2682a7f1dcecfb73
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Sergio Ahumada [Mon, 14 Jan 2013 11:58:09 +0000 (03:58 -0800)]
tst_bic: Add bic data for linux-gcc-ia32
Adding bic data for the following modules:
- QtCLucene
- QtDesigner
- QtDesignerComponents
- QtHelp
- QtUiTools
Change-Id: I1886fa9f6659c0a97d6b428d4667cd032f06afbd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Nico Vertriest [Mon, 21 Jan 2013 14:59:15 +0000 (15:59 +0100)]
Doc: corrected reference to customwidget.pro paragraph
Referred to par 1. Corrected to 3.
Task-number: QTBUG-29101
Change-Id: Icaa0e4eb06f24fcc7f2d369401fa8f49ed3b1d29
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Nico Vertriest [Fri, 14 Dec 2012 14:27:17 +0000 (15:27 +0100)]
Doc: Corrected spelling of Qt UITools in formbuilder.cpp
Linked to landing page
Task-number: QTBUG-28623
Change-Id: I9b263b9e44470c860a72d77eddfcbce93007ec26
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
kh1 [Fri, 11 Jan 2013 12:00:18 +0000 (13:00 +0100)]
Compare only clean path. Fixes compares with /./ in path.
Change-Id: I980dce2e294d81e6486345d13b15deaf568340bf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
kh1 [Thu, 10 Jan 2013 11:50:10 +0000 (12:50 +0100)]
Remove all Trolltech references.
Change-Id: Idad55a5e6d87ea5703681e3ef11fc35ce9ff84eb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Sergio Ahumada [Sat, 12 Jan 2013 08:12:00 +0000 (09:12 +0100)]
doc: Fix namespace version to 5.0.1 for qhp documentation
Change-Id: Idc6c21d77739a14b1eb31b2296422f57d67fb478
Reviewed-by: hjk <qthjk@ovi.com>
Tim Jenssen [Fri, 11 Jan 2013 08:11:11 +0000 (09:11 +0100)]
Fix the missing webview Qt Designer plugin.
Task-number: QTBUG-29031
Change-Id: Ie91ec524292358388586827acbd69ec2fed44072
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Sergio Ahumada [Wed, 2 Jan 2013 12:02:44 +0000 (13:02 +0100)]
Update copyright year in Digia's license headers
Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
kh1 [Thu, 10 Jan 2013 11:45:46 +0000 (12:45 +0100)]
Fix examples "make install", missing the doc files.
Change-Id: Ifcfc888782e2087476f6f65388db5cda753e0ee7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Andy Shaw [Fri, 4 Jan 2013 11:35:20 +0000 (12:35 +0100)]
Deploy the mediaservice plugins if QtMultimedia is used
Change-Id: Iac597d5216a5750850ee8132cbf4a609c032700a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
kh1 [Tue, 8 Jan 2013 11:46:12 +0000 (12:46 +0100)]
Revert most of
227a60a427f83931ca8bdaec7509a673738f053b.
The help engines findFile() does already resolve virtual folders in
different namespaces, so the added code was superfluous. It did not
even work properly... Implement a redirect network reply, so when a
file from e.g. qtwidget is linked into qtcore, we will get the valid
url set inside the address bar. This also fixes "Bookmark" handling,
"Sync to Contents" as well as "Copy" and "Hover" actions.
Change-Id: I418af5962d9f1d9970febb07f8f1c52e9995c58c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
kh1 [Wed, 19 Dec 2012 16:33:17 +0000 (17:33 +0100)]
Fix search for non-existing term with filters turned on.
Task-number: QTBUG-26733
In case we search with attributes, all fields including the actual
search term needs to match. Otherwise we will find all pages with
matching indexed filter attributes, but ignoring the search term...
Change-Id: I691afb839a4175e800ab71a40ead7963f3c54c31
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
kh1 [Wed, 19 Dec 2012 14:45:56 +0000 (15:45 +0100)]
Fix Assistant search crashes with square brackets, etc...
Task-number: QTBUG-28700
In
8f83747d12 escaping of special characters got lost in translation,
though it is required since some of these, like [] are field separators
inside clucenes index file. The full text search throws exceptions if
it encounters un-escaped field separators.
Change-Id: I5e457f95db426554d29bc33bea00a92fb6cfcba5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
kh1 [Wed, 19 Dec 2012 13:08:35 +0000 (14:08 +0100)]
Merge from Qt Creator. Adds geometry awareness.
Task-number: QTBUG-22619
Change-Id: I34cd11c1021592560776e78452072c335b1ead21
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Sergio Ahumada [Wed, 9 Jan 2013 09:02:59 +0000 (10:02 +0100)]
Merge branch 'stable' into release
Change-Id: Idb96b903fb08ad6fcd8fad4ba139bab27c8554da
Thiago Macieira [Sun, 23 Dec 2012 02:20:47 +0000 (18:20 -0800)]
Fix warnings found by the headersclean test
qhelpsearchengine.h:71:9: error: declaration of 'wordList' shadows a member of 'this' [-Werror=shadow]
Change-Id: I3d0d6216276c9c06091d0f726c8513cc52da1885
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Thiago Macieira [Sat, 29 Dec 2012 18:05:12 +0000 (10:05 -0800)]
Move functions from an anonymous namespace in a header
Clang doesn't like functions declared in an anonymous namespace in a
header and then later not used. It treats those are static functions,
and the -Wunused-functions warning is printed for them.
Instead, declare them inline in a regular namespace and use it.
qclucene_global_p.h:106:19: error: unused function 'QStringToTChar' [-Werror,-Wunused-function]
inline TCHAR* QStringToTChar(const QString &str)
^
Change-Id: I94696d40693558ef105281c8ec6e30159c47844d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Oswald Buddenhagen [Fri, 21 Dec 2012 10:02:52 +0000 (11:02 +0100)]
make use of qtHaveModule()
Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Dirk Mueller [Fri, 4 Jan 2013 16:40:54 +0000 (17:40 +0100)]
Try harder in matching the method signature
In cases where the Propertiesdialog has no specific Implementation
for a dbus data type, it creates a regular QLineEdit. In such cases,
qdbusviewer then tried to call the method with the arg set to a string
instead of the real datatype (for example uint64), which usually does not work.
We can be more clever and try to implicitely convert the user input
to the right datatype, which makes the invocation succeed.
Change-Id: Idbb5c667496e14922efb7d195e11fafbb880c61c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Sergio Ahumada [Sat, 22 Dec 2012 17:09:29 +0000 (18:09 +0100)]
Add changes-5.0.1 file
Task-number: QTBUG-26065
Change-Id: Id7b0b90c571d3f4419ea3f792cb49832fab6738e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Sergio Ahumada [Fri, 21 Dec 2012 23:46:02 +0000 (00:46 +0100)]
Bump Qt version to 5.0.1
Change-Id: I9aa9ff5a41084a953c7c130fd6880606541ff28b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Thiago Macieira [Sat, 29 Dec 2012 18:51:41 +0000 (10:51 -0800)]
Fix warning about hidden overloaded virtual, found by Clang
qlayout_widget.cpp:1577:17: error: 'qdesigner_internal::<anonymous namespace>::QBoxLayoutSupport::findItemAt' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
virtual int findItemAt(int /*at_row*/, int /*at_column*/) const { return -1; }
^
/Users/tjmaciei/src/qt/qt5/qttools/src/designer/src/lib/shared/qlayout_widget_p.h:198:17: note: hidden overloaded virtual function 'qdesigner_internal::QLayoutSupport::findItemAt' declared here
virtual int findItemAt(const QPoint &pos) const;
^
Solve the problem by using the old functions, hence not hiding them.
Change-Id: I3af0c43fc7266ae74e8b05103e4306be740c618a
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Fri, 21 Dec 2012 18:44:44 +0000 (19:44 +0100)]
fix install path
Change-Id: I6a56cff510011e3ffd516d24d9659f75baca14b2
Reviewed-by: hjk <qthjk@ovi.com>
Miikka Heikkinen [Thu, 20 Dec 2012 10:10:11 +0000 (12:10 +0200)]
Add qmake generated files to .gitignore.
Add source files generated by qmake for automatic static plugin
imports to .gitignore.
Change-Id: If28edc65fd29313bd8a9c699ae64a453a5462cb4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 19 Dec 2012 18:38:21 +0000 (19:38 +0100)]
Merge 'release' into stable
Change-Id: Ie325bf13e34736edf4118c8ee640e23b2f9270bf
Oswald Buddenhagen [Mon, 17 Dec 2012 15:06:41 +0000 (16:06 +0100)]
remove some unnecessary (and even wrong) project setup code
the centralized code handles it just fine
Task-number: QTBUG-28633
Change-Id: I46105ab301869dec807fdc4ca5fe5e563bc217b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Tue, 18 Dec 2012 13:41:12 +0000 (14:41 +0100)]
Fix help URLs in tools.
Task-number: QTBUG-28689
Change-Id: Ifa3eb5ed1ae3928671a85d3aaeb2ef37b196ee4a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Sergio Ahumada [Mon, 17 Dec 2012 19:42:41 +0000 (20:42 +0100)]
point dependencies to 'release' branches
Change-Id: I335664312eea8c0911b1edcc37c1c4e96212722f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Jerome Pasion [Mon, 17 Dec 2012 14:42:15 +0000 (15:42 +0100)]
Doc: Correcting qhp links to the Linguist and Assistant examples
Task-number: QTBUG-28579
Change-Id: I9b46915e2f5fcd1b228e7b302bcb433f820460a2
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Jerome Pasion [Mon, 17 Dec 2012 13:20:14 +0000 (14:20 +0100)]
Doc: Fixed qhp link to Qt UI Tools C++ Classes
Task-number: QTBUG-27777
Change-Id: I08eab3e32e37a96066f3b922712babd327c4e95c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
kh1 [Fri, 14 Dec 2012 13:29:00 +0000 (14:29 +0100)]
Enable exceptions code, makes Assistant far more stable.
Task-number: QTBUG-28592
The reason to enable exceptions (always) is that we build the
full text engine with exceptions as well, which throws erratic.
Once it does that the database it creates is in a unknow state,
which leads to new exceptions on next Assistant start. So it will
never start again until someone removes the broken index by hand.
Change-Id: Ic24a9e28bddf4657753f9b670c38ecda527d7af4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 20:11:43 +0000 (21:11 +0100)]
remove pointless harfbuzz include
Change-Id: I27d86f1712c820c94aae578b488393bdb9fc5936
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 19:23:58 +0000 (20:23 +0100)]
remove QT+=widgets from SUBDIRS projects
it makes no sense whatsoever
Change-Id: Ida65c7fb02e53bd3d1ccb319bdbcbec4c836b871
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 19:09:35 +0000 (20:09 +0100)]
remove obsolete DEPENDPATH assignments
qmake now adds CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.
Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 18:40:12 +0000 (19:40 +0100)]
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.
Change-Id: I0f6429ef61b73b9d57b9f1fc08b789d39e5b99c0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
kh1 [Fri, 14 Dec 2012 11:11:49 +0000 (12:11 +0100)]
ActiveQt documentation is not registered in Qt Assistant.
Task-number: QTBUG-28609
Note: there's already an task to add files based on its extension, see
QTBUG-28345. Cause this might introduce more regression we decided to
go the whitelist route for the 5.0.0 release and fix it the next minor.
Change-Id: Ia1f72e0ed39746fca203813bfe8523fd9956fb61
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Miikka Heikkinen [Fri, 14 Dec 2012 10:58:17 +0000 (12:58 +0200)]
Fix position of rendered QAxWidget in designer preview
Added correct offset to render call.
Task-number: QTBUG-28595
Change-Id: Iab9fecdcf48c8f72fe28ac1cae72bcd2ea5830e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Nico Vertriest [Tue, 11 Dec 2012 11:32:22 +0000 (12:32 +0100)]
Added hardcoded url to Designer Manual
Workaround to QTBUG-28500
Change-Id: I523d7296ac6a1b8ead5ceeed6af2937e7034abdf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Miikka Heikkinen [Wed, 12 Dec 2012 11:34:03 +0000 (13:34 +0200)]
Link only minimal qpa plugin to qhelpgenerator in static build
Task-number: QTBUG-28131
Change-Id: I4da2cae750701125d63b934b2bc0d66c788638f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Wed, 12 Dec 2012 08:12:49 +0000 (09:12 +0100)]
Doc: fix the Qt Linguist example page
Use the \group and \ingroup commands to have qdoc
list the examples. Edit the \brief contents.
Change-Id: Iae0769bd1272b03d94b9287b9fddf78df27e1f12
Reviewed-by: David Schulz <david.schulz@digia.com>
David Schulz [Wed, 12 Dec 2012 07:27:00 +0000 (08:27 +0100)]
QtTools: Doc: Added missing image to uitools examples.
Change-Id: I6e0144ef2ded5e7dd95b332436a9a7dcbbcfc6fb
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Leena Miettinen [Tue, 11 Dec 2012 16:31:48 +0000 (17:31 +0100)]
Doc: Fix example pages for Qt Tools
Use the \group and \ingroup commands to produce Qt 5 style
example pages. Unify the file structure for example docs.
Add example page for Qt Help and move Context Sensitive Help
example to it (from the Qt Assistant Examples page).
Change-Id: I687b18a134037588a5a536fe2353c18dfd44b1d7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Oswald Buddenhagen [Fri, 7 Dec 2012 19:00:00 +0000 (20:00 +0100)]
make qtbase source requirement explicit
getting rid of QT.<module>.sources references, as they don't go well
with real modularization.
Change-Id: Idfe0327b00be173e2c2a0b4fc4d2c50de7c2dbe8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 6 Dec 2012 16:26:02 +0000 (17:26 +0100)]
make use of qt_headersclean.prf
Change-Id: I20a8c472114c9343562fff3ddefae5113cdaeb52
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Nico Vertriest [Tue, 11 Dec 2012 14:45:00 +0000 (15:45 +0100)]
Entered hardcoded url for Plural Form in Translation
Task-number: QTBUG-27512
Corrected in linguist-manual.qdoc
Change-Id: I42a1e618dfd4c09f8f8956fe8df574ef09637d36
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
David Schulz [Tue, 11 Dec 2012 14:02:20 +0000 (15:02 +0100)]
QtTools: Fixed install targets for examples.
Change-Id: Id930c26beecb3e49ccfb3595bb96a03576f9cd82
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
David Schulz [Tue, 11 Dec 2012 13:23:06 +0000 (14:23 +0100)]
QtTools: Doc: Removed example dir from the qdocconf
... because the examples were double build.
Change-Id: I4b6f6ba937f52223dd30eb78fc814646200bbec3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Leena Miettinen [Tue, 11 Dec 2012 11:46:17 +0000 (12:46 +0100)]
Doc: add missing files for Qt UI Tools docs
The files were ignored by Git, so they did not get
submitted as part of I156dbf0a071137e1e6f3ba99cc390aa88c80b836.
Change-Id: Icb3a35d24993ea77077ee3a2e09f347c48c583bd
Reviewed-by: David Schulz <david.schulz@digia.com>
David Schulz [Tue, 11 Dec 2012 12:55:46 +0000 (13:55 +0100)]
QtTools: Doc: Fixing links in designer and assistant.
Change-Id: I98ff1c2dd615cbe3a79f19bada8964082ce8f21f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Jerome Pasion [Tue, 11 Dec 2012 11:30:48 +0000 (12:30 +0100)]
Doc: Fixing typo in landing page file name.
Change-Id: I24ad7c50437d4cbbdcd95d9df5a63693d213aaa5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Friedemann Kleint [Mon, 10 Dec 2012 16:27:26 +0000 (17:27 +0100)]
Remove scripting getter/setter of QUiLoader.
Scripting in QUiLoader was an experimental feature in Qt 4.8 whose
implementation was removed in
159c3d35d41a121f9cbf55631aebbd309b683811 .
Change-Id: I325ca032033659a03df4ab83f642b6a9b15f5590
Reviewed-by: hjk <qthjk@ovi.com>
David Schulz [Tue, 11 Dec 2012 08:46:20 +0000 (09:46 +0100)]
QtTools: Doc: Added picture for uitools.
Change-Id: I922772f91a5d6c131d7896a1026ddb023649bd48
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Leena Miettinen [Mon, 10 Dec 2012 09:44:00 +0000 (10:44 +0100)]
Doc: modularize Qt Designer custom plugin docs
Create index and module pages for Qt Designer custom
plugin classes. Modify the qdocconf file to also build
the Qt Designer plugin class docs. Move snippets from
qtdoc to qttools. Fix links to the classes page in example docs.
Change-Id: Ie191fdb07fb0b00379a15d44c1355f00815053e6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Leena Miettinen [Mon, 10 Dec 2012 16:05:31 +0000 (17:05 +0100)]
Doc: Modularize Qt UI Tools documentation
Move the Qt UI Tools examples and example docs to qttools.
Create index, module, and example pages and a qdocconf file.
Fix links to module documentation (index page). Fix links to
snippets and examples. Add the command to build docs to the
project file.
Change-Id: I156dbf0a071137e1e6f3ba99cc390aa88c80b836
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Miikka Heikkinen [Mon, 10 Dec 2012 12:58:39 +0000 (14:58 +0200)]
Add PLUGIN_CLASS_NAME to qttools plugins
Needed for automating static plugin loading.
Task-number: QTBUG-28131
Change-Id: I4e7c7b5342c7dde99580d42100c8b9d89b809515
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Fri, 7 Dec 2012 15:24:23 +0000 (16:24 +0100)]
Doc: Modularize Qt Help docs
Add index and module pages for Qt Help, add a qdocconf file,
and move snippets. Add doc build command to help.pro.
Task-number: QTBUG-28449
Change-Id: Ic022693d82ee3664bf57e708df89c4a71aadb78e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
David Schulz [Fri, 7 Dec 2012 13:16:31 +0000 (14:16 +0100)]
QtTools: Add example page for assistant.
Change-Id: I1f15f3db46206731da7741554cc128620af7f652
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Oswald Buddenhagen [Thu, 6 Dec 2012 15:29:34 +0000 (16:29 +0100)]
follow move of cmake file templates
Change-Id: I712dc95c62597064acf60ecc594638c3a69ff8e8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Christian Stenger [Fri, 7 Dec 2012 09:47:00 +0000 (10:47 +0100)]
Doc: Replace outdated macro from docs
Change-Id: I525c1322a46115f64fe94d48a0ebc2d4fb2e2e12
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Fri, 7 Dec 2012 09:49:44 +0000 (10:49 +0100)]
doc: Remove old information about Qt Linguist 4.3 and Windows Vista
Remove old text about Qt Linguistic being certified for Windows
Vista. Also removed the Windows Vista image.
Change-Id: Ie8fde974e0666f48dd86f691c3c2745a252549bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Miikka Heikkinen [Wed, 5 Dec 2012 14:00:30 +0000 (16:00 +0200)]
Remove dependency to ActiveQt sources in designer plugin.
Seems that building using qaxtypes.* directly from qtactiveqt repo
is unnecessary, so remove them.
Task-number: QTBUG-26848
Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
David Schulz [Thu, 6 Dec 2012 13:22:30 +0000 (14:22 +0100)]
QtTools: Fix example names after adjusting exampledirs
Change-Id: I00f60412346c85de044eb784a36f98a12c4ccd05
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
David Schulz [Thu, 6 Dec 2012 10:34:35 +0000 (11:34 +0100)]
QtTools: Doc: Moved assistant examples
... and changed exampledirs in the qdocconf files
to the appropriate modules.
Change-Id: Ic15d9fc845d59fb4e84ee39a52e457666fa09e51
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Paul Olav Tvete [Tue, 4 Dec 2012 12:05:34 +0000 (13:05 +0100)]
Make kmap2qmap compile again
Task-number: QTBUG-28165
Change-Id: I46dc5c05f6f4d6079ec53a94abda0351cdfb5f83
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Leena Miettinen [Thu, 6 Dec 2012 08:59:14 +0000 (09:59 +0100)]
Doc: move a Qt Designer howto to qttools
One more file was missing from the modularization:
Creating and Using Components for Qt Designer. The links to
images in the file were consequently broken.
Change-Id: I7ae9f7efd74acc3dc030999796afcbaa48110696
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
David Schulz [Wed, 5 Dec 2012 15:01:26 +0000 (16:01 +0100)]
QtTools: Doc: Fix lots of links in the designer manual.
Change-Id: I7ae1e9b56f6066798ca8620d96bf42f991b1064d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
hjk [Wed, 5 Dec 2012 12:17:25 +0000 (13:17 +0100)]
Change project names in tools' qdocconf file
This triggers generation of suitable qthelp:// urls in the example manifests
Change-Id: Ibecd48fa7854e9916cc7b0a2e33569935d387c69
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
David Schulz [Wed, 5 Dec 2012 11:01:03 +0000 (12:01 +0100)]
QtTools: Remove reference to lupdate and lrelease
... in the linguist manual.
Change-Id: I26f4289760f3b70c1f7815872b86e33fe94718f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Joerg Bornemann [Tue, 4 Dec 2012 16:41:06 +0000 (17:41 +0100)]
fix installation target paths of examples
Change-Id: I11440d60a709cbe4617aa0953c7971a6d731b73b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Joerg Bornemann [Wed, 5 Dec 2012 10:00:37 +0000 (11:00 +0100)]
leverage qt_example_installs.prf
Change-Id: Ie6b02fd48aaa6b303629bb8e66cfe567aa8ca7df
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
hjk [Wed, 5 Dec 2012 11:48:16 +0000 (12:48 +0100)]
Add \brief description to tools examples.
Change-Id: I713620c8c5cf55147b1c5732d745569916a8e264
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Tue, 4 Dec 2012 19:59:25 +0000 (20:59 +0100)]
Change copyrights from Nokia to Digia
Change-Id: I118a50ef99e42878c01e1ee509c2bf86c70ec05d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Friedemann Kleint [Tue, 4 Dec 2012 15:09:02 +0000 (16:09 +0100)]
Qt Linguist: Fix help URL.
Task-number: QTBUG-28373
Change-Id: I1c5929ffee32843867d2401a23386545f36b9bcc
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Friedemann Kleint [Tue, 4 Dec 2012 15:02:19 +0000 (16:02 +0100)]
Qt Designer: Fix help URLs.
- Fix building of URLs.
- Correct URLs of manual and style sheet manuals
- Remove the 'What's new' option.
Task-number: QTBUG-28373
Change-Id: I4d1dfd6154f799e9bb00c0a75aa62a7239b0f81f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Leena Miettinen [Tue, 4 Dec 2012 14:36:42 +0000 (15:36 +0100)]
Doc: add example pages for Qt Designer and Qt Linguist
Move the example landing pages from example.qdoc in qtdoc
to the appropriate places in qtdoc.
Change-Id: Ieb5a2b001b1e20940903f3e53856bcbf8138ed76
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>