Oswald Buddenhagen [Mon, 5 Aug 2013 14:58:39 +0000 (16:58 +0200)]
introduce new message type "vanished"
this state is equivalent to "previously finished, but now obsolete", or
in gettext terms "not fuzzy and obsolete".
this bumps the ts format version to 2.1.
Task-number: QTBUG-12948
Change-Id: I6c89bbfb9b16053b4e1219ec7611cb7a34189d95
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 2 Aug 2013 17:02:55 +0000 (19:02 +0200)]
complain about missing sources in id-based messages
i considered making this optional on the basis that the source strings
may be assigned externally, but in that scenario lupdate wouldn't be
used to start with.
Task-number: QTBUG-11843
Change-Id: I3f09db902462b8e94f7a134f6fe950562b300307
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Jerome Pasion [Thu, 1 Aug 2013 10:38:41 +0000 (12:38 +0200)]
Doc: Set the \module pages' \qtvariable.
-Tells QDoc the module's QT variable value
Change-Id: I91cbaa6eb75ea181dc1b049d92a8acd97cbf1344
Reviewed-by: Martin Smith <martin.smith@digia.com>
Frederik Gladhorn [Tue, 23 Jul 2013 09:15:57 +0000 (11:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5368a3b3212af59ac5b95bc56c667b0d3392078a
Friedemann Kleint [Thu, 18 Jul 2013 10:19:50 +0000 (12:19 +0200)]
Assistant: Remove InstallDialog.
Task-number: QTBUG-32390
Change-Id: I160b1a15198a51869716b339bb356eb0740f5adc
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Friedemann Kleint [Thu, 11 Jul 2013 07:56:47 +0000 (09:56 +0200)]
Qt Designer/widgetdatabase: Remove unused member variable m_form.
Change-Id: I68ed51365a6341b2d537fe4eaf22f9eae1432483
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Frederik Gladhorn [Thu, 11 Jul 2013 21:28:12 +0000 (23:28 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990
Gabriel de Dietrich [Fri, 5 Jul 2013 15:51:43 +0000 (17:51 +0200)]
Update Info.plist files for new Cocoa main() call pattern
We would get the following error message otherwise, 'No Info.plist
file in application bundle or no NSPrincipalClass in the Info.plist
file, exiting.'
Needed by I790e5138c29aac2e0215a9147d0148fece40ca22.
Change-Id: I8d2301c41e4957195be8ed5da9a55ab5b02c4608
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Stephen Kelly [Wed, 10 Jul 2013 20:48:32 +0000 (22:48 +0200)]
Use QT_HOST_DATA/src to get to the mkspecs.
QT_HOST_DATA/get changed semantic on the dev branch.
Change-Id: I2b190ce011a91144eb8b1731fa58d71d64cd6b17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Stephen Kelly [Tue, 2 Jul 2013 22:14:46 +0000 (00:14 +0200)]
Add a unit test for testing Qt in its install location.
Change-Id: I01400afbc7ce0d42ce8afb0e87aef70647900228
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Shawn Rutledge [Tue, 9 Jul 2013 13:39:09 +0000 (15:39 +0200)]
Assistant: ifdef qWarning about missing translations
There's no reason for only assistant to do this, and there are enough
missing translations that a lot of users will tend to see this message.
Task-number: QTBUG-31747
Change-Id: I333d15eaeb603e4c64a1a12791b4f94658b80e80
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Sergio Ahumada [Fri, 5 Jul 2013 18:33:18 +0000 (11:33 -0700)]
test: Add 5.1.0 bic data for linux-gcc-ia32
Change-Id: Idad7deea144d5f097158bc17eaff8b871b806c63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Sergio Ahumada [Fri, 5 Jul 2013 12:55:20 +0000 (14:55 +0200)]
tst_bic: Remove QtDesignerComponents and QtCLucene data
QtDesignerComponents and QtCLucene are private modules,
so testing for bic doesn't make much sense.
Change-Id: I143db9a69aeaa223156d642a1153f268dc06b757
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Frederik Gladhorn [Thu, 4 Jul 2013 13:28:40 +0000 (15:28 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If58a09c4ed878ed7a1a350036ab1cc2e99a907f1
Oswald Buddenhagen [Fri, 28 Jun 2013 14:08:01 +0000 (16:08 +0200)]
use designercomponents-private correctly
Change-Id: I44bdd427912d8963c1853e97961f6153629422ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Frederik Gladhorn [Thu, 27 Jun 2013 11:00:59 +0000 (13:00 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3
Jerome Pasion [Wed, 26 Jun 2013 08:56:00 +0000 (10:56 +0200)]
Doc: Setting navigation variables for tools and tool manuals.
-for the navigation bar.
Change-Id: I151739bd5f5a3473e03699465cf7edeaae8b3a82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Friedemann Kleint [Fri, 21 Jun 2013 08:21:36 +0000 (10:21 +0200)]
Designer: Fix morphing of widgets in QSplitters.
They were not handled at all, children were just reparented
resulting in the morphed widgets being appended.
Task-number: QTBUG-31911
Change-Id: Idae8f66663416d514a2f3c299e58d726a3dd578a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Frederik Gladhorn [Thu, 20 Jun 2013 14:28:22 +0000 (16:28 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic056eeec62fbbbf5c932d8e862736f368833f34d
Frederik Gladhorn [Thu, 20 Jun 2013 14:19:07 +0000 (16:19 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6e22c4ce74e71c41ff43eb0403dab7193df4d0d8
Oswald Buddenhagen [Mon, 17 Jun 2013 14:28:11 +0000 (16:28 +0200)]
help: print long options with a single dash as well
we simply strip the second dash, so make the doc consistent with the
other tools.
Task-number: QTBUG-24626
Change-Id: I3286808094dc9c64ade821a3db797cb207e0eac9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Gabor Garami
Sergio Ahumada [Mon, 13 May 2013 18:33:20 +0000 (20:33 +0200)]
Add changes-5.1.0 file
Change-Id: I3ade90a360ccece54ac07b1c0c7f71d5bdffc3a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Stephen Kelly [Thu, 13 Jun 2013 15:44:06 +0000 (17:44 +0200)]
Find the cmake version template in the install location.
Task-number: QTBUG-31153
Change-Id: Ibd90f9959306b34c2228e44d86cb03c97f47bb68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Jerome Pasion [Wed, 12 Jun 2013 13:30:23 +0000 (15:30 +0200)]
Assistant: Adding 'qtquickcontrolsstyles' to the list of qch loaded.
Task-number: QTBUG-31692
Change-Id: Ie8e4befc75e0a2df9149c1bf028b88b2572e3148
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Frederik Gladhorn [Tue, 4 Jun 2013 17:52:00 +0000 (19:52 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: Ib2c94071cee5846db9b16ee4d3e9aeb897e9070e
Frederik Gladhorn [Fri, 31 May 2013 11:49:48 +0000 (13:49 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9c98f8277a31aa84e447262ae6745180880d4d2c
Teemu Kaukoranta [Tue, 28 May 2013 11:39:06 +0000 (14:39 +0300)]
Changed contact details
Contact details from qt-project.org to qt-project.org/legal
Used the following command:
find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee
>(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{
s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I
}}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*)
(.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.*
|.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.*
|.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.*
|.*http:\/\/www\.qt-project\.org\/.*)/
\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs
sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}')
Change-Id: I87a501e4fab3b47797190ea7bbf6257a33fe3d7f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Topi Reinio [Thu, 30 May 2013 07:58:03 +0000 (09:58 +0200)]
Doc: Rename Qt Designer license information page
Rename the license information page to a more generic one, and list
licenses for individual contributions under it.
Task-number: QTBUG-28536
Change-Id: Ia88d99640ab23837f4db2a820fc95c9318d3b365
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Sergio Ahumada [Tue, 28 May 2013 18:30:16 +0000 (20:30 +0200)]
Bump MODULE_VERSION to 5.1.1
Change-Id: Ib44a1ad96996ec3a3a756cfa030a75d2b4c66e57
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 19 Sep 2012 19:56:16 +0000 (21:56 +0200)]
make error() abort the qmake run, not just the current file
sync up implementation with qmake.
this doesn't actually have an effect on lupdate, as error() is disarmed
in cumulative mode.
Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
0da7f097249f71726140a38647bb4824b09fad7b)
Reviewed-by: hjk <hjk121@nokiamail.com>
Daniel Teske [Tue, 4 Sep 2012 09:41:32 +0000 (11:41 +0200)]
add ProFileEvaluator::resolvedMkSpec()
sync up implementation with qtcreator.
Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtcreator/
867d655278398561c2bfe879e42062f93ae85453)
(cherry picked from qtcreator/
7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Daniel Teske [Tue, 23 Oct 2012 15:40:10 +0000 (17:40 +0200)]
excerpt from "Qt4Project: Do a build_pass evaluation"
sync up the implementation with qtcreator
Change-Id: I3673dd93b37b10102a0c1f1ce053e1aef8aaf53f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtcreator/
95169eb8e39c6f43b7e74fbb18d4db19a38b0124)
Reviewed-by: hjk <hjk121@nokiamail.com>
Orgad Shaneh [Tue, 9 Oct 2012 08:17:43 +0000 (10:17 +0200)]
QMakeEvaluator: Set pro file as source for internal variables
Task-number: QTCREATORBUG-7006
Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/
6e3af2bf2e2833e0ecbc9b366af8e06abd7ecf96)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Wed, 5 Sep 2012 19:26:28 +0000 (21:26 +0200)]
update size calculations for assignment statements
this was forgotten when the value lists were extended by a size hint.
Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from qtcreator/
f24c9865306624c2fc150d4bd262a5c4d5a3689a)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 28 Aug 2012 17:24:30 +0000 (19:24 +0200)]
add missing ifdefery
sync up implementation with qtcreator.
Change-Id: I6a1578818512fa3b0773faf276a1d56881eb06d7
(cherry picked from qtcreator/
0ad234b691aafedd5b78669780220334b951b045)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Orgad Shaneh [Sun, 16 Sep 2012 08:15:08 +0000 (11:15 +0300)]
Fix warning
Warnings came up using MinGW 4.4:
* qmakebuiltins.cpp: 'QString windowsErrorCode()' defined but not used
[...]
Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
81f4ecdd7920ffcec4244bf70a0aedf4fbfb66e3,
(cherry picked from qtcreator/
0e13cf3faffc7463ae2bf535dfdb008202112cc4))
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Tue, 12 Mar 2013 11:23:34 +0000 (12:23 +0100)]
Fix Krazy warnings about includes/header guards in proparser.
Change-Id: Ie0067544492a207255a3ff3f43d95d2976c73c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/
80011dde399cfa43372dd23ff1b1f12afa4b7938)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Joerg Bornemann [Fri, 3 May 2013 11:29:54 +0000 (13:29 +0200)]
fix warning in ProStringList_join
Fix C4267 MSVC warning.
Make sepSize an int, because this function is never called with a size_t.
Change-Id: I2b834fe7c1408e34d55d9f137231e2f5816f3f1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Gabriel de Dietrich [Fri, 24 May 2013 18:25:40 +0000 (20:25 +0200)]
Fix combobox not opening in treeview item delegate editor
This is the same fix as for QTBUG-30715, which leads me to think that
we should spend some more time and re-think how QComboBox gets focus.
See also qtbase
3b992f831.
Task-number: QTBUG-31298
Change-Id: I4393af00c8896051e9ed8b5d8af510633106913c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Sergio Ahumada [Fri, 24 May 2013 20:32:24 +0000 (22:32 +0200)]
sync.profile: Point dependencies to an empty string
This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.
If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.
Change-Id: I527d529456fba47fcb4e48c1129612d620878f0a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Frederik Gladhorn [Thu, 23 May 2013 11:15:30 +0000 (13:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4556ce5965020154a563cef9613305cafae3c674
Janne Anttila [Wed, 24 Apr 2013 12:02:40 +0000 (15:02 +0300)]
Fix assistant and designer builds without printer.
The actual code using printer related classes is already wrapped with
QT_NO_PRINTER macros, but the include statements were not.
The reason why include statement probably were not wrapped with
QT_NO_PRINTER is that in Qt4 all headers were synchronized to include
directory. Now with Qt5 modularization headers for modules which
are disabled are not anymore synchronized to include directory so
they need to be wrapped with same ifdefs.
Change-Id: I0efd1342cd18860b5fed63b248812e9dced8f2b3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
kh1 [Wed, 15 May 2013 09:20:22 +0000 (11:20 +0200)]
Add missing documentation sets - still hardcoded :(
Task-number: QTBUG-31107
Change-Id: I517974a937baaa0371357bb7791d86b26f853049
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Kai Koehne [Fri, 17 May 2013 13:32:43 +0000 (15:32 +0200)]
QtGradientEditor: Fix compiler warning about redefined macro
Change-Id: Ib946a2eb49bc7723dc44257581661a3b2b86956e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Kai Koehne [Fri, 17 May 2013 13:31:34 +0000 (15:31 +0200)]
Designer: Remove unused typedef
Change-Id: Ibe91cb9573ec5ef9ca2cc0a7c36be33b0dec681f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Kai Koehne [Fri, 17 May 2013 13:30:55 +0000 (15:30 +0200)]
Fix gcc warning about unused code
Change-Id: I88bef60bb272319229a92481deec4ac9de9a0547
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Fri, 10 May 2013 07:19:40 +0000 (09:19 +0200)]
Qt Designer: Fix help URL to point to qdesigner-manual.html.
Change-Id: I59a14c7f2a2c770b4b67a2af5c4d5542519f0d63
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Mon, 13 May 2013 16:19:28 +0000 (18:19 +0200)]
create a .qmake.cache for the lupdate tests
mac mkspecs are really noisy without it now, which makes the tests fail.
Change-Id: I6b4900c51d0b8aedd9309482a30055e48c3b9f69
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Thu, 16 May 2013 13:21:20 +0000 (15:21 +0200)]
make stubs for dangerous/useless qmake functions in limited mode
instead of having them "not implemented" (and consequently getting
errors), just let requires(), system(), mkpath(), write_file(), touch()
and cache() do nothing. this is likely to cause followup failures which
are harder to detect, but the amount of scary noise we are producing now
is not really acceptable. furthermore, in qtcreator these failures
actually terminate the "precise" evaluation, which breaks Run
Configurations.
Task-number: QTBUG-28159
Task-number: QTCREATORBUG-8550 (in different repo)
Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 12 Mar 2013 20:48:12 +0000 (21:48 +0100)]
don't send output of $$join() and $$sprintf() through split_value_list()
in the case of sprintf it's surprising, in the case of join it's
anti-thetical.
Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
ae94bf2b7a6373def9239ae5f54b143e1f6ffe09)
Oswald Buddenhagen [Mon, 25 Feb 2013 19:08:23 +0000 (20:08 +0100)]
clean paths of found files in prepareProject()
any of the directories may be the root, which would lead to double slashes
in the constructed filenames.
Change-Id: I053e167a19b795b40e780fc29db356c7f24d286a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
97be79012cd39d1d0e7748d5c500d86c3becc258)
Oswald Buddenhagen [Thu, 7 Mar 2013 20:47:42 +0000 (21:47 +0100)]
make split_value_list() mostly sane
don't count parentheses, don't nest quotes, don't create empty elements.
the backslash still escapes only quotes (and itself) - $$list() (one of
the main users of this function) is commonly used with (windows) path
lists, so letting it escape anything would make a royal mess.
Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
6c22b9b3e86d1617665f7b81b105c032f43c6d72)
(cherry picked from qtbase/
a5c2ab47867a558d6f8f62126fb8e4f2777cfe06)
Oswald Buddenhagen [Tue, 5 Mar 2013 11:35:05 +0000 (12:35 +0100)]
permit returning from files
this allows skipping an entire feature file if a condition is not
fulfilled, without putting the whole body inside a conditional.
Change-Id: I84fe9c94dda58c794fb52c3f163b40563b0db30a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
525eb337670f61078383c20ad9be274dcf2d0928)
Oswald Buddenhagen [Tue, 5 Mar 2013 10:32:15 +0000 (11:32 +0100)]
remove pointless initialization of qmakespec
we have proper fallback paths further down the line.
Change-Id: I3648cc985d21bbec4c2c24e179830db4467af210
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
0dedf8c3403923b963c51eb65d9cbe838d5ba0d4)
Tor Arne Vestbø [Fri, 15 Feb 2013 11:24:22 +0000 (12:24 +0100)]
Update feature paths on assignment to QMAKE_PLATFORM
Instead of after parsing the makespecs, were we assumed QMAKE_PLATFORM
had been set by the makespec and did an explicit update.
Allows loading platform specific features from within a makespec after
updating QMAKE_PLATFORM.
Change-Id: I0eb3b7fb88ce48b00a384850c5d87223c06234d7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtbase/
4dd29248cd43ff730f7432b51a443b72fad3523d)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 16 May 2013 15:19:06 +0000 (17:19 +0200)]
remove automatic splitting from $$() expansions
$$(FOO) would automatically split the contents of the environment
variable at whitespace (and interpret quoting inside it). the way to
prevent the splitting (but not the quote interpretation) would be using
"$$(FOO)".
this behavior is entirely unexpected and thus an incredibly effective
source of quoting problems - according to a grep over the whole qt
sources, there isn't a single case where things were done right. in qt
creator, well over half the cases are wrong.
also, the "feature" seems entirely pointless: nobody uses spaces as
separators in environment variables.
consequently, simply remove it, even in a patch release. i'm postulating
that nobody will complain.
Change-Id: I9ed3df1b0d1ef602acd78ceb118611d294561da6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
566d28316dd73bfe4a8ea34839989ee9df7e3895)
Oswald Buddenhagen [Tue, 11 Sep 2012 17:30:29 +0000 (19:30 +0200)]
don't pretend that break()/next()/return() are functions
it's a pretty braindead thing to implement control flow statements as
(built-in) functions.
as a "side effect", this fixes return() value handling for lists.
(cherry picked from qtcreator/
f53ed6c4b3feca59a94d4f0de8b1a7411122e30e)
(cherry picked from qtcreator/
f529e22ec38fb9a656d74394e484d2453cf42c69)
Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtbase/
8400896cfe3fbef7666329a2920bd0dbdd5890af)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 11 Sep 2012 16:43:29 +0000 (18:43 +0200)]
improve parse error recovery paths
to reduce collateral damage from parse errors.
(cherry picked from qtcreator/
00c0d0d5e42d28e03c2846c17d3acbcd8420859d)
Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtbase/
ae3f95a951334dee001e37c305e4d7bf91c0d1b3)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
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>
Marc Mutz [Mon, 26 Nov 2012 14:06:17 +0000 (15:06 +0100)]
lupdate: allow to configure names of tr()-like functions
This makes it possible to use lupdate in projects that would like to
wrap the tr()-like functions with their own versions, e.g. to add
error checking or other instrumentation code.
While we're at it, also simplify the c++ parsing with partly
table-driven code.
Change-Id: I72af68afa851a46342e75dcdd3dd58f4c14276b8
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
Frederik Gladhorn [Wed, 3 Apr 2013 12:58:25 +0000 (14:58 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5e1eb924132b9f1a032886d3b6c0e16bcc623fa9
Frederik Gladhorn [Wed, 27 Mar 2013 13:31:31 +0000 (14:31 +0100)]
Update module version to 5.2.0
Change-Id: I310777c1005de28da1eb6326fec03ebb7716919a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
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>
Frederik Gladhorn [Wed, 27 Mar 2013 13:31:30 +0000 (14:31 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iaa0684017736c6a5ec387a201add89fc351adfe2
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