Oswald Buddenhagen [Fri, 16 Aug 2013 19:33:22 +0000 (21:33 +0200)]
fix handling of country-less languages like esperanto
it's impossible to instantiate QLocale objects like that, so the
language setting would be simply clobbered. instead, we now convert
between numerical and string codes directly.
unfortunately QLocale has no public api for that. but we are including
private QTranslator headers already anyway, so whatever.
Task-number: QTBUG-14592
Change-Id: I95189c1898aa1fb5520ecf7057521597ed9331f1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 15 Aug 2013 14:51:46 +0000 (16:51 +0200)]
make TR_EXCLUDE work for #include statements as well
Change-Id: I299043c63c6e8b2f24eeee7d3f03a514b96bca5f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 8 Aug 2013 16:01:22 +0000 (18:01 +0200)]
don't complain about missing include()s during cumulative evaluation
it produces simply too many false positives.
Change-Id: I3dfa109866450babe5c16f84665ad22024d99e42
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 9 Aug 2013 10:17:11 +0000 (12:17 +0200)]
execute some loops even in cumulative mode
we execute foreach loops now. this is (mostly) safe nowadays, because
a previous change added precautions against exponential value list
growth, so it's unlikely that two nested loops would keep the cpu busy
for a day as before.
we continue to exclude forever loops and loops with excessive integer
counts.
Task-number: QTBUG-8550
Change-Id: Iaa116086986cc7fd5023834753f791dd205102e5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 7 Aug 2013 13:54:29 +0000 (15:54 +0200)]
don't print warnings from parser & evaluator
they are pretty much noise in lupdate context.
we still print error messages: the ones from the parser are always
genuine, while the ones from the evaluator are at least occasionally
helpful.
Task-number: QTBUG-28159
Change-Id: I6cdb11b51c0a3f569ec430f98a0068f933db903d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 7 Aug 2013 13:54:12 +0000 (15:54 +0200)]
don't print project messages/warnings/errors
they are meaningless during the cumulative parse we are doing
Task-number: QTBUG-28159
Change-Id: I501e7e9b0066fc3f36543147d71632b0d20cca08
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Sergio Ahumada [Fri, 9 Aug 2013 20:39:27 +0000 (22:39 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ida20e2ebeb6316e2c6916570ce2e166951af9ee2
Topi Reinio [Thu, 8 Aug 2013 13:21:55 +0000 (15:21 +0200)]
Doc: Fix qthelp URL used in Remotecontrol example
Task-number: QTBUG-32877
Change-Id: Iecd50007e5790f0c938febe4e98e36275fe35a80
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 6 Aug 2013 13:11:37 +0000 (15:11 +0200)]
fix strings from #included sources not being collected
Task-number: QTBUG-27974
Change-Id: I30edae2db5449605984a118458b1ccce7ad67eb1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 25 Jun 2013 15:44:35 +0000 (17:44 +0200)]
make TR_EXCLUDE work for SUBDIRS
this is needed for excluding subprojects we have no direct control over,
e.g., git submodules.
note that unlike TR_EXCLUDE for files, this matches SUBDIRS entries, not
actual project file names. wildcards also work, though.
Change-Id: I1d0a0410a28af4a60f045ee5bbac34540c14f0bd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 7 Aug 2013 11:47:13 +0000 (13:47 +0200)]
use correct AND operator
amends
066b08fc62 and
e1f3732197
Change-Id: I248c1b3b85b9857552bfba34fdb5299024bb55eb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 7 Aug 2013 11:26:15 +0000 (13:26 +0200)]
purge pointless QT_DISABLE_DEPRECATED_BEFORE=0
neither the tool test code nor the lupdate test data need any of it.
Change-Id: I7604596f17308f7d49850f683b8ab84a0bc88131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 7 Aug 2013 11:23:51 +0000 (13:23 +0200)]
build without QT_DISABLE_DEPRECATED_BEFORE=0
Change-Id: I76f23c2bb29bba1bcdb9f49cecc7aba36716161f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Stephen Kelly [Tue, 23 Jul 2013 07:22:17 +0000 (09:22 +0200)]
CMake: Use path manipulation features from qtbase.
The qtbase commit
4ce32f66 (Use new path manipulation functions
from qmake., 2013-01-18) used new qmake functions for path manipulation,
and commits
7ac58d1f (Make cmake packages installed to /usr
non-relocatable., 2013-02-11) and
5aa34962 (Handle usr-move without
forcing absolute paths, 2013-04-17) added handling of symlinks which
would otherwise break relative path calculation.
Port those patches to the qttools cmake files.
Task-number: QTBUG-32570
Change-Id: I7d22609c3a03be4b9197dd030d7e9bd6c2e04731
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Fri, 2 Aug 2013 14:06:01 +0000 (16:06 +0200)]
remove dead files
Change-Id: I3735795bc51ad42ff7ad242221ef1dd174d882f1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 15:48:58 +0000 (17:48 +0200)]
don't ignore changes to meta data when updating translation units
Task-number: QTBUG-18890
Change-Id: Iceb466105d5fae56da0e2d26cb245fa610fed865
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 15:30:07 +0000 (17:30 +0200)]
reshuffle the code for clarity
less spaghetti, less nesting
Change-Id: Ib60214e23e20c9592f4eba362ea7a55fe92d8805
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 14:44:59 +0000 (16:44 +0200)]
de-duplicate extra comments when adding a message multiple times
Change-Id: I1ed80166be3cb53f865c083b0a693148b6000731
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 12:41:08 +0000 (14:41 +0200)]
update all data of existing messages in extend()
when the message identifier (msgid or context/source/disambiguation)
appears in multiple places, the remaining meta data may be inconsistent
between the occurrences. we need to handle partial data on one hand, and
contradicting data on the other.
Task-number: QTBUG-29131
Task-number: QTBUG-32725
Change-Id: I1ed08e42e266b0b5f014400c137abbcec9ffb93d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 10:05:47 +0000 (12:05 +0200)]
avoid false positives when looking for magic comments
expect meta data only at the beginning of statements.
this required syntax fixes in some unrelated autotests.
Task-number: QTBUG-11866
Change-Id: Ic0c0c150ac8648df6953a510b8eb0c199c8d3ae2
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 1 Aug 2013 09:04:48 +0000 (11:04 +0200)]
make comments not confuse the c++ parser
comments can appear pretty much everywhere. consequently, handling them
as proper tokens is rather tedious (and was of course not done
consistently, leading to numerous bugs).
so take them out of the token stream and handle magic comments "in the
background".
this necessitates that we use match() a bit more sparingly, as we must
not call getToken() after a "tr()-terminating" token too early, as it
might erroneously collect subsequent magic comments too early otherwise.
Task-number: QTBUG-21876
Change-Id: I3d2168f019dfc06b0778142bcd5eb619b61e6b2d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 31 Jul 2013 14:22:10 +0000 (16:22 +0200)]
cancel complex constructs at end of #define
it's possible that we encounter the end of a #define statement while in
the middle of a complex construct (which is part of a macro, obviously).
we should discard those, as otherwise Weird Things may happen.
Change-Id: Ie9608ad0215e105ab5e5bac110e4118029fa6c15
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 31 Jul 2013 14:21:51 +0000 (16:21 +0200)]
micro-cleanup: exit directly upon unexpected eof
there is not much point in going on.
Change-Id: Ic278941c4b8bbce4ccd93ab92628ab98c2ab3ae2
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 31 Jul 2013 12:45:57 +0000 (14:45 +0200)]
remove pointless additions
yyWord is always empty at this point.
Change-Id: I1bf897c61e25d52978a77a0d6121078ef264b503
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 31 Jul 2013 08:43:32 +0000 (10:43 +0200)]
don't claim that single slashes are comments
Change-Id: Iae5c66ebebe580595a16caa765eeee9f5e97f2c4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 26 Jul 2013 17:46:15 +0000 (19:46 +0200)]
fix handling of c'tors with namespaced parent classes
this is achieved by setting yyTokColonSeen under much narrower
conditions (when we are pretty sure that we are seeing the start of a
c'tor's initializer list), which allows us to unset it under much
narrower conditions (when we are pretty sure we are seeing the start of
the c'tor's body), so we now actually *do* skip over qualifications
which would confuse us.
Change-Id: Ic04bad57a08cc66d41094775570d25e7288e6324
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 26 Jul 2013 17:37:41 +0000 (19:37 +0200)]
clear prospectiveContext after "consuming" it
otherwise it would trigger useless assignments later on.
Change-Id: I8af23747c8f1abcadc3fd86810093303db65117e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 26 Jul 2013 15:54:36 +0000 (17:54 +0200)]
make QT_TR_NOOP work in static initializers, take 2
simply ignoring equal signs turns out to be not so smart: there are
static initializers without braces, which consequently do not look like
function definitions with a weird additional char.
Task-number: QTBUG-9276
Change-Id: I7d200aee7b81f17b42866eca4830be388c8edb64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 30 Jul 2013 10:05:31 +0000 (12:05 +0200)]
ignore bracketed expressions only outside function scope
static initializers obviously cannot appear in scopes, so there is no
reason to suppress parsing tr() statements used for indexing inside
functions.
Task-number: QTBUG-29998
Change-Id: I3a0330e1382cd5a74106328ae6722a02af282f7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 26 Jul 2013 13:11:57 +0000 (15:11 +0200)]
avoid infinite loop on unterminated bracketed expressions
Change-Id: I9469608e1b9ce1d345c4011982b19814ebd39b53
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 25 Jul 2013 13:12:44 +0000 (15:12 +0200)]
adjust to qHash(QString) returning a full int's worth of bits in qt5
Change-Id: I3f9357a2affa63cc50c6fc20b61d7ea4323a6cfb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
El Mehdi Fekari [Mon, 29 Jul 2013 10:03:35 +0000 (12:03 +0200)]
lupdate: Fixing decoding of QML files
Decode text stream from QML files as UTF-8 even when the latter
is not the default system encoding (QML supports UTF-8 only).
Change-Id: I32ccf88e93182ffa78345235217258761e95195a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 24 Jul 2013 17:46:53 +0000 (19:46 +0200)]
don't complain about non-EEXIST io errors twice
simply use the new parser flags to report all errors directly.
Change-Id: I9156da340913cb2cdd3465d99ad81321232192e5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 24 Jul 2013 17:45:58 +0000 (19:45 +0200)]
complain about absent files to -pro argument
Task-number: QTBUG-30618
Change-Id: I908fc3792bdc321370e51be98adf7a9c81e37a85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 24 Jul 2013 17:28:33 +0000 (19:28 +0200)]
avoid boolean argument trap: introduce QMakeParser::ParseFlag
Change-Id: I26ce032a1aa044e9a4da0c8708a4490b07374992
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Takumi Asaki [Fri, 26 Jul 2013 08:11:04 +0000 (17:11 +0900)]
Linguist: Set windowTitle in form preview.
Task-number: QTBUG-26868
Change-Id: I065d17cbf3c4426f3ba95b8c8f999f181af4b062
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Sergio Ahumada [Fri, 26 Jul 2013 14:27:43 +0000 (16:27 +0200)]
Move uiloader test from tests/auto to tests/manual
- bring tst_screenshot test back
- make tst_screenshot compile
- make tst_uiloader compile
Change-Id: I12b584e834a5942699644637cce6071f0de58654
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Sergio Ahumada [Fri, 26 Jul 2013 19:52:43 +0000 (21:52 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I4ad3ca66f63476974bdfcadcff373179715a34d2
Sergio Ahumada [Fri, 26 Jul 2013 08:58:22 +0000 (10:58 +0200)]
Fix compilation when QT_NO_PRINTDIALOG is defined
Seems like QT_NO_PRINTER does not imply QT_NO_PRINTDIALOG,
so both need to be checked.
Change-Id: I164e602e75ebb524a33cfacaad68023e33f8978f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Sergio Ahumada [Tue, 23 Jul 2013 10:06:21 +0000 (12:06 +0200)]
Bump MODULE_VERSION to 5.1.2
Change-Id: Ie2ab17222cb7f8b3d4047aa08fed1b8f74a89df4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Tue, 16 Jul 2013 06:32:37 +0000 (08:32 +0200)]
Fix CLANG-warning about unused variable q_ptr.
Change-Id: Ife2e8d38059dfff33f544587f8a8b6f6c8bc2a8b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Fri, 19 Jul 2013 14:07:23 +0000 (16:07 +0200)]
Add deployment documentation for translations.
Task-number: QTBUG-28766
Change-Id: Ibc1b71fde39d344167f7dcecba81e2618c3e4e97
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Sergio Ahumada [Mon, 22 Jul 2013 13:33:17 +0000 (15:33 +0200)]
Add changes-5.1.1 file
Change-Id: I7254379bc54c5aa562fd13b44f66d245244c4d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
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>
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>
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: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 [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>
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>