Christian Strømme [Mon, 6 May 2013 16:26:18 +0000 (18:26 +0200)]
Android: Fix for compilation error in clucene.
Android only provide stubs for wcstoll(3) and wctomb(3), to solve this
wcstoll(3) is replace by an internal equvialent, and wctomb(3) by
wcrtomb(3).
Change-Id: Ic30e5a809c2f6ab30b4e52883d3aae3ecc036194
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 26 Apr 2013 12:49:51 +0000 (14:49 +0200)]
make use of qt_app.prf
Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 25 Apr 2013 18:05:19 +0000 (20:05 +0200)]
adjust to new "configure -nomake tools" semantics
Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 26 Apr 2013 11:51:19 +0000 (13:51 +0200)]
remove pointless INCLUDEPATHs
Change-Id: I8e8bfd391ef8b243e288094f5a02544efe1b2f49
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 26 Apr 2013 11:51:09 +0000 (13:51 +0200)]
parallelize SUBDIRS
Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Fri, 26 Apr 2013 11:35:09 +0000 (13:35 +0200)]
remove pointless mac scope
this subdir is only entered on mac.
also, if this scope was actually skipped, the result would be rather
unexpected ...
Change-Id: Ie46b0bfcac081ff55b737c444d15ff6afaf1507b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 22 Apr 2013 14:46:41 +0000 (16:46 +0200)]
remove pretenses of building kmap2qmap
the 'embedded' scope (qws) is dead.
Change-Id: I4942d90eac9583787610ed3217145240fa89693f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Axel Waggershauser [Fri, 15 Mar 2013 10:19:34 +0000 (11:19 +0100)]
Improve warning message about code being auto-generated
Change-Id: I9b5460ed09ed458f86e4ea3001f73e482ef97765
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Axel Waggershauser [Fri, 15 Mar 2013 02:24:22 +0000 (03:24 +0100)]
Fix trailing whitespace issue in ui4.cpp generating xsl
Fix the line responsible for generating the trailing whitespace in the
qtbase/src/tools/uic/ui4.cpp file.
Change-Id: I446ce360c5064dc6a88b7b472790e9672cc6b30a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 22 Apr 2013 12:19:24 +0000 (14:19 +0200)]
remove pretenses of building makeqpf automatically
the 'embedded' scope (qws) is dead.
makeqpf is a graphical host tool to be used in the process of deploying
embedded software. as the qt build system does not support such a
configuration, the tool simply must be built manually.
Change-Id: I6aeafb758e6e55ec228b535ef7354d4c78745e80
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Paul Olav Tvete [Mon, 22 Apr 2013 13:51:43 +0000 (15:51 +0200)]
Update README: it's not 2008 anymore
Change-Id: I4f4e1273216df9aadc9af789cdcda3127f0ccc3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Mitch Curtis [Tue, 12 Mar 2013 14:51:26 +0000 (15:51 +0100)]
Make linguist's source viewer read all files as UTF-8.
It currently loads source files as latin1, which means unicode
characters are not supported.
4944ea0586 removes -codecfortr and hence the ability to specify an
encoding. lupdate will then treat all code as UTF-8, so this patch
does that too.
Task-number: QTBUG-27238
Change-Id: Iefed45de5b4925fee267834a5ed93457fc45b700
Reviewed-by: Debao Zhang <hello@debao.me>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Tue, 16 Apr 2013 06:55:23 +0000 (08:55 +0200)]
Doc: remove help output from the Qt Linguist Manual
This is difficult to maintain and users always get
the up-to-date information by executing the help
command.
Change-Id: I13e9b7d7f89bb60d0b73cbbc721d6a8a05112a31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Mon, 15 Apr 2013 10:39:02 +0000 (12:39 +0200)]
Doc: describe translation sources in Developer topic
Move information from the Release Manager topic and
add information about QML sources in the Qt Linguist Manual.
Change-Id: I0d2a2ea68a2e7e94895b41436d9f973d8c2cb2aa
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Leena Miettinen [Wed, 10 Apr 2013 15:44:23 +0000 (17:44 +0200)]
Doc: remove details about i18n from Qt Linguist Manual
Add links to topics that describe i18n in detail for
C++ and QML.
Change-Id: I47b95b040dd9efe4eb8951dedbf94ab8988316e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Mon, 25 Mar 2013 10:02:39 +0000 (11:02 +0100)]
Doc: rewrite Translators topic in Qt Linguist Manual
Make the topic task-oriented. Move information around and
remove redundancy. Check the paths to commands and availability
of commands. Make docs reflect some changes in functionality.
Remove images of toobar buttons that are no longer referred to
in text.
Change-Id: I7f9743d35ceebfc0f7097a1af2e12eeb344c8e58
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Wed, 10 Apr 2013 10:10:38 +0000 (12:10 +0200)]
Doc: replace "balloon help" with "tooltips"
In the Qt Linguist Manual.
Change-Id: I4ec995afa821d786535a140730187058665e029c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Wed, 10 Apr 2013 10:09:39 +0000 (12:09 +0200)]
Doc: add link to Internationalization with Qt
To the Qt Linguist Manual.
Change-Id: I55b3ccb8fe04b6997c3ce953de6544a193b3548e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Tue, 9 Apr 2013 08:22:49 +0000 (10:22 +0200)]
Fix plugin export macros in Qt Designer documentation.
Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 .
Task-number: QTBUG-30508
Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Leena Miettinen [Wed, 3 Apr 2013 15:09:08 +0000 (17:09 +0200)]
Doc: move release management task list in Qt Linguist Manual
Move the description of the release process from the Developer
chapter to the Release Manager chapter.
Change-Id: Ia119e57b090d10d23b875120b1394be1c89b8405
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Fri, 5 Apr 2013 12:51:49 +0000 (14:51 +0200)]
QUiLoader/Designer: Fix gcc 4.8 warnings about unused typedefs.
Change-Id: I792f3060c808ef860b31b47b3b00e5ac1991eedd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Frederik Gladhorn [Wed, 3 Apr 2013 14:10:54 +0000 (16:10 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/assistant/assistant/assistant.pro
Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0
Friedemann Kleint [Wed, 27 Mar 2013 15:31:46 +0000 (16:31 +0100)]
Assistant: Fix static linking on Windows.
Check for existence of sqlite-plugin.
Breakage introduced by
d73afeeafc7df8192508c1a5617944d303d5a0a2 .
Change-Id: I2595ed4d80e0804f1c2503cddf94ca15e4922af9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Stephen Kelly [Tue, 26 Mar 2013 19:51:12 +0000 (20:51 +0100)]
Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.
The generation relied on the uitools module for the version, so
if it was not available, we got errors like this:
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake'
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake'
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake'
http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz
Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the
generation location.
Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Friedemann Kleint [Tue, 19 Mar 2013 11:27:48 +0000 (12:27 +0100)]
Assistant: Fix static linking for Linux.
main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'
The import for the DB plugin should now be generated by qmake.
Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
(cherry picked from commit
f212e46fe930ee89a8cb52beeeccc03369c015a1)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Sergio Ahumada [Mon, 25 Mar 2013 10:15:42 +0000 (11:15 +0100)]
Bump MODULE_VERSION to 5.1.0
Change-Id: I1f48216fd27e40d70ffd020ed1b880b03df0bf12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Fri, 22 Mar 2013 09:13:46 +0000 (10:13 +0100)]
Doc: edit Qt Linguist Manual for style
Replaced "e.g." with "for example" and "etc" with
"and so on". Removed contractions. Removed some extra spaces.
Change-Id: Ic0b9d5df2ee7f7bb080abb002027546f0fc6da4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Leena Miettinen [Wed, 20 Mar 2013 15:35:53 +0000 (16:35 +0100)]
Doc: move Qt Linguist overview information
From front page to a separate topic.
Change-Id: Idc9a599e0c8f095b0d6d63fd74b43848a8b13d3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Sergio Ahumada [Tue, 19 Mar 2013 20:39:43 +0000 (21:39 +0100)]
Add changes-5.0.2 file
Change-Id: I7c55f4441aa671fc320113a95b74e4b1bdbd689a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Sergio Ahumada [Wed, 20 Mar 2013 08:21:30 +0000 (09:21 +0100)]
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
Friedemann Kleint [Tue, 19 Mar 2013 11:27:48 +0000 (12:27 +0100)]
Assistant: Fix static linking for Linux.
main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'
The import for the DB plugin should now be generated by qmake.
Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Oswald Buddenhagen [Fri, 8 Mar 2013 17:46:29 +0000 (18:46 +0100)]
make lupdate a host tool
lupdate makes no sense on x-built targets at all.
though one may also argue whether it makes sense to actually bootstrap
it - while its use may be supported by the build system, it's typically
not part of regular builds, but rather used shortly before running
linguist - for which a host build of qt is necessary anyway.
one argument for bootstrapping is that it uses the qmldevtools library,
which logically should be bootstrapped (the only other current user is
qmlmin, which definitely *is* used in regular builds and thus needs
bootstrapping).
Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 7 Dec 2012 19:00:11 +0000 (20:00 +0100)]
make lconvert a host tool
it's a build tool, so it should be built for the host.
Change-Id: I55baee65d3e91bf5189c10f30e23975abfc4de10
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 8 Mar 2013 15:58:29 +0000 (16:58 +0100)]
make lrelease only optionally bootstrapped
qt_tool.prf handles the magic for us.
Change-Id: Ifb8e7fd7ff0e46b9b274c9d156e048e89586ab2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 8 Mar 2013 17:48:56 +0000 (18:48 +0100)]
fix translation contexts
the bootstrapped library now fakes the translation api sufficiently
well to enable unifying the usage.
Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Wed, 6 Mar 2013 14:29:08 +0000 (15:29 +0100)]
support only utf-8 and utf-16 for source code
utf-16 is optionally used by java and msvc. it doesn't hurt to support
it. all other encodings are not used anyway (other than 8-bit
pass-through, but this is a matter for (the also removed) CodecForTr).
Change-Id: Ie6482e187a9a8276918b53e97faeac88a40eb52c
Reviewed-by: hjk <hjk121@nokiamail.com>
Stephen Kelly [Thu, 14 Mar 2013 13:24:03 +0000 (14:24 +0100)]
Run the qttools cmake module tests only if QtWidgets is available.
Change-Id: I26847e3347cf24664ca52488ddf521c923e37912
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Frederik Gladhorn [Thu, 14 Mar 2013 08:25:25 +0000 (09:25 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
Stephen Kelly [Wed, 13 Mar 2013 16:12:28 +0000 (17:12 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Frederik Gladhorn [Wed, 13 Mar 2013 14:07:32 +0000 (15:07 +0100)]
Remove qaccessible2 bic data.
Change-Id: I629046a2a7aa0611cda4f04f8d6253d5db4e05a3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Stephen Kelly [Tue, 12 Mar 2013 10:06:20 +0000 (11:06 +0100)]
Install the Qt5LinguistToolsConfigVersion.cmake file.
Change-Id: I8f14f79c1e8e17816d63303f130773780547346a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Wed, 6 Mar 2013 13:44:59 +0000 (14:44 +0100)]
purge CODECFORTR & -codecfortr support
qt-based code is expected to be utf8-encoded nowadays. the respective
c++ interfaces have been purged in 5.0 already.
Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Oswald Buddenhagen [Tue, 5 Mar 2013 19:00:54 +0000 (20:00 +0100)]
purge ui3 support from lupdate
there is no qt3support in qt 5 any more.
Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 5 Mar 2013 17:05:49 +0000 (18:05 +0100)]
purge TS 1.1 support
at the time of release it will be almost five years since we introduced
TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of
a need to write such files any more - and this commit doesn't even
remove 1.1 reading capability (because it comes for free so far).
Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf
Reviewed-by: hjk <hjk121@nokiamail.com>
Frederik Gladhorn [Tue, 12 Mar 2013 10:31:44 +0000 (11:31 +0100)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I4c19a5f76b8605134aeab29130a20df187f8f107
Friedemann Kleint [Wed, 6 Mar 2013 08:51:13 +0000 (09:51 +0100)]
Aero-Style-QWizard: Remove special handling in Qt Designer.
The wizard now behaves nicely when used as a child widget.
Task-number: QTBUG-29904
Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Leonard Lee [Fri, 8 Mar 2013 13:33:34 +0000 (14:33 +0100)]
List supported file formats in search indexing.
The supported file formats is implemented in
QHelpSearchIndexWriter::indexableFiles() function.
Task-number: QTBUG-30110
Change-Id: I4b68d765da6769b52b74f7fa4fbc1a1bcbfd4e08
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Friedemann Kleint [Wed, 6 Mar 2013 12:49:51 +0000 (13:49 +0100)]
Fix warning about superfluous parentheses (CLANG).
Change-Id: I0fa2c6d5bf04bb3cf9d0314207ccb0a21b928f22
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Wed, 6 Mar 2013 12:47:53 +0000 (13:47 +0100)]
Qt Designer: Remove unused code (detect by CLANG).
Change-Id: Idf1da5c69f90e4ce94319fc722180988cbc44dc5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Thu, 21 Feb 2013 11:00:58 +0000 (12:00 +0100)]
Enable Active-X plugin in Qt Designer.
Task-number: QTBUG-29733
Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Friedemann Kleint [Mon, 25 Feb 2013 16:22:41 +0000 (17:22 +0100)]
Fix moving widgets in horizontal layouts in RTL mode.
Task-number: QTBUG-25872
Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Wed, 27 Feb 2013 14:49:50 +0000 (15:49 +0100)]
Active X plugin: Fix setting a control by task menu.
The property is a QString when set by the menu or a
PropertySheetStringValue when loading the form.
Breakage introduced by
8695c1753964eeb06b5d9306010b56be5fc151c0 .
Task-number: QTBUG-29234
Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Jocelyn Turcotte [Fri, 1 Mar 2013 19:41:01 +0000 (20:41 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Robert Loehning [Wed, 13 Feb 2013 18:15:19 +0000 (19:15 +0100)]
HTML improvement
Change-Id: If70901325b3f4d5cbda705e4261fc18ea97c1bc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Tue, 26 Feb 2013 12:31:30 +0000 (13:31 +0100)]
define MODULE_VERSION
Task-number: QTBUG-29838
Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Stephen Kelly [Tue, 26 Feb 2013 13:00:30 +0000 (14:00 +0100)]
Use qmake for package dependency resolution in cmake tests.
This allows us to remove hardcoded depends information.
Change-Id: I91150ae89b230ebbbcfc9706b70ea135149af0c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Frederik Gladhorn [Mon, 25 Feb 2013 10:59:08 +0000 (11:59 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a
Oswald Buddenhagen [Mon, 17 Dec 2012 15:17:47 +0000 (16:17 +0100)]
nuke sharedcomponents.pri
it doesn't actually do anything useful for quite a while
Change-Id: Ibe52bd7408227655ae8295d78823105163385897
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Johanna Aijala [Thu, 21 Feb 2013 07:38:02 +0000 (09:38 +0200)]
Merge branch 'stable' into release
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
Friedemann Kleint [Wed, 20 Feb 2013 13:13:20 +0000 (14:13 +0100)]
Rich text editor: Add support for Right-to-Left blocks.
Task-number: QTBUG-9502
Change-Id: Ic1b0e4abdf71022609a90fc00f29e493958d9feb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Frederik Gladhorn [Mon, 18 Feb 2013 15:09:29 +0000 (16:09 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
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>
Sergio Ahumada [Sun, 27 Jan 2013 08:50:37 +0000 (09:50 +0100)]
Remove QT_{BEGIN,END}_HEADER macro usage
The macro was made empty in qtbase/
ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@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>
Friedemann Kleint [Mon, 21 Jan 2013 12:41:56 +0000 (13:41 +0100)]
ActiveQt Designer plugin: Load control string correctly.
Task-number: QTBUG-29234
Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Fri, 18 Jan 2013 15:39:33 +0000 (16:39 +0100)]
Qt Designer: Use multiline validation for dynamic string properties.
Task-number: QTBUG-26394
Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Frederik Gladhorn [Thu, 17 Jan 2013 17:25:39 +0000 (18:25 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
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>