From 154f6c859ea9f0fb35f3a8e2ad9566fd9126d3ab Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Sep 2012 12:04:46 +0200 Subject: [PATCH 01/43] Add installer target. Requires Qt Installer Framwork (IFW) Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f Reviewed-by: Tim Jenssen --- dist/installer/ifw/config/config.xml.in | 24 + dist/installer/ifw/config/logo.png | Bin 0 -> 4256 bytes dist/installer/ifw/config/watermark.png | Bin 0 -> 12983 bytes .../meta/installscript.qs | 155 ++++++ .../meta/license.txt | 504 ++++++++++++++++++ .../meta/package.xml.in | 15 + .../meta/package.xml.in | 9 + qtcreator.pro | 15 +- scripts/packageIfw.py | 132 +++++ 9 files changed, 851 insertions(+), 3 deletions(-) create mode 100644 dist/installer/ifw/config/config.xml.in create mode 100644 dist/installer/ifw/config/logo.png create mode 100644 dist/installer/ifw/config/watermark.png create mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs create mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/license.txt create mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in create mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in create mode 100755 scripts/packageIfw.py diff --git a/dist/installer/ifw/config/config.xml.in b/dist/installer/ifw/config/config.xml.in new file mode 100644 index 00000000000..39fe7f4f00f --- /dev/null +++ b/dist/installer/ifw/config/config.xml.in @@ -0,0 +1,24 @@ + + + Qt Creator + {version} + Qt Creator + Qt Creator Maintenance + Qt Project + http://qt-project.org + + logo.png + watermark.png + QtCreatorUninstaller + + @homeDir@/QtCreator + /opt/QtCreator + + + + I have read and understood the terms contained in the above license agreements. + I do not accept the terms contained in the above license agreements. + + + + diff --git a/dist/installer/ifw/config/logo.png b/dist/installer/ifw/config/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d892f85fe2c11f273bc66774fad74c3deeddb989 GIT binary patch literal 4256 zcmeAS@N?(olHy`uVBq!ia0y~yV6X&X4mJh`h8~ILRt5$Jwj^(N7l!{JxM1({$qWn( zoCO|{#S9D#9$@TtGTRO$SXSVe4$=$87RqVY7#R4Mc)B=-WZb(ttGXcOYUP3Y=kI>6 zyy`VgN5%fh^c=}#12G8$#-NOXf*^%LFZN{*wm3{SX;f@&oR)H_L~Y4ogG!SfoEHMp zBsO^R81nlk^BDTbUT6I?AzmSRTh894cc+$>mVbX&JNMs4{%qBo({g8CFfMk#^?Pph z`=4{)Ti^eA&T{^OfGJmb8JJdVD2;qs*8Sko={*Z8Kieu!_by~$cHlQ)$!Mr~x&GV7 z{|h^qWDdk6tesM0ClQh*uKVqmRN4+3x&B9DOpGa93t|rhKH#{(H;3U@!^87hHG-d{ z66Q{c5#rL^vgSi@^lK-M37@u{pM8MCz=G``M}f=>)%8E$%omE&SS|gGNuOD_i+SCS zOa6~#&d+>sF2u)yHOaxeAV;Leozc$mo>fi*_f1Bp$h#ksA0%o9W@XK-dG|{}Z~Bga z`TUU#1N#*^8mfer5^Snu<_ zVY~F4>kUg9GY4bc{u95i`^yJ0HnnD}ZCF$gKk53f>5a0_KNp3+Y@d|=hewq0hx_)A zF=+JRK!h9}wN@3K=6yFVVL)f%eaKV0lt>T|-yqROld7clE zj$Dk+&T4nnbEaL3Kbjj}Gt)aQ-bY2?*vo>6rXj!F`ZjMbx0Wy2>#TFPTWLzCHCJcq zZ3YeT9nNaJnk*${&n$jzY-Z1|Z1|o3FS}`R!18YSXW*eX`4P`={Bp`xDB) zSNF)ijE%Jt^yf9#+uhYOagp^^Kb^a$TR(A}O3~tEWM*btySrpx>1Xqb5Bl$<*(1W_ z53V`k^e*>j`ZV)Dl0mmrXC`_?eP7lYHU0D1)$<<6+kNL=H@{f=8|$3yYD+z1&zrwl z^;7%jG4c1u7FwKoQmd?9QT|`vz*Ike#~ZdRWmATbiq$)kUp9YP(syxc&hdpBDVNNm z#G=Gvf{ap^KiZejV8H3i#khAb+sh^0zxP*&i~cK^xu^Vzg#Y`B7GC!MQ|oVi(D?rM zQ6gLL#z}khOlC_zuhqS8$kf*EYtzRt-Ar%af`oL|%-aQfoRbp|GliM0mr$?Y{&%}f z-+N_|qDwU!`?r_xKYjZB-l(wWpMFWtc$R;_B==F_f`FcKj1()mTC#&W?N%+tHQ{iOWDKGYg9S^?FjsAIC|4!@ux9kh7 z0@{tYPB^@_*=E}>!7Qh*A^la?d%9R-Y>P!_%}jK7yD0wcpDzlGZb4$xUMBo(TKYKU z@GXVT9Q#EU+vYT_(h_gqZT&)CZpp^9u#LNCNXH(EUdg}n=cUjqAwJsG=TpUFk6+p~ zm0?e9g{}UZUxrCswr^ja4Rz2;eOUZ+hWV*IU8+k}FZ7%_$;QdiCZlrM^H)3jsaJZl zEaxwHf92qQB^ixFjlq`dIo`=As4lrI_RwL*tgcsukG9M^wB_uk>bUhz=dO4zX*>PS z+%JE@I>(2{rRxv1w|}2@(yG00|V&BGHFfPlzNZC$EBodV32Ur&Xr6 znD};He>uBgO~kgT>rGZ&T(m)D>)TJ)v<@|%e&{xDQc~8|@6Gam9z5Bu{{6%g=>VR6 zyw>LLc#}5Gw?6;ru>3y(#TIuCLwB#0K3b0^-tf8Amtt2o*CJ&1hiJZjyI&f!&2oi$ zdwa7NUCg+AW~T95V>V{Kb_Zi)iD`}e@iXrj9{e%MsNblpGgbL`<)f8){5BsL{B1t6 zT#v8+8}7XDLTzqtZu!09^R~;k%PSsu8sw2~T5?%Jz1(`wW3^n(&&yuQY<`@6Q*GB$ z-Y4qruxP$< zgVL#Rl{QU5C&eea@m(*cxn1*!pP>5qalie!UteEOJv-a{e`;~@XRH19<=?)2TPwYS z?TF;@6omy7POUf+)cMhTefVu@=FhX)`BG2H zKlU0swK?$x@I+bj^|gO->8w~i@srAv6CJLh8cuI#DC{w=Y?-sv_ebyMyZ3i~K4*Qg zRMz+Mv^6n1KmBCo7OT1b{`+s;(@vL7DnC3p*xw-Yvv}5JYdOu&&!pBBY8XSGH-Rx0e^Rt)6UY@ z*9@z_<=l_X-&^{9Q|f6mGc&Wgn@@`@i+0Kcc?GQuNjlyq%g!}nrm>S#-OrHt_lf1d z8Tsb?Na4mTEJSb6Fi&m>Rvq)<%6j^XO>z|Gn$h<=Ht{%{}(CNO5UOLBWR? z)$jLScm8K{w8it?N0T!Jm#>+f`Srd2_|xL)(`H_u^fJ8o@*nGpuZyQ!Ud-G0ZJG7X z(xc+1=iR@#v(;speE;#ru%hfrZ zR8g^`{&=74Th;?XUzDa?<+W;Mo;ppt_DuYPqw^Bo_*EQ*=^%d|KCyW_uK7}5v8K#vENPeB8qY&@2-6-{Ui7Fx?Dq%9nX=!U0?!K$)aC@7iq-5at zcXxO1XIL@c_{j^lT`^qZSAXBQ|B>@;t!#`RQS3tzC03K1ht{-u$xu-|9E}&Wom;o%H_04c_w`c6{S{^NBY(Gugg= z=C`S(tJCj)-}_5a{H{C?YxCl>n>fmiCQbVC{k!tgC7U)0o!)e6U5uW4dHMH!+qP|! z`1y0=nmNWxrUH8xze#F$tbZyr0cT?J~bLP$udEL!+|6RUr zS(QE4@43Z-jr$*ev{<#uDEF4hk|`0>LO-pTmOAld${FW&zFLkYC)}-qnIm=1cK>C` zN~-zZ>Ry@q{Ph?0-zTIpi_+Rs%-Yh@-1=81x_~d$jH_=6%@}X~^T;IL_`1}6r zfx;_~E!60FarnsP+NGw;kJP=7s@yKSa?Ovf!w)q+&q|)_b8&K6d3kVjbo8tbxwrLt zoi$aLWnQ{_cW?FYZ*OCL5>^E>Md~b^AUt8o8@)*%A4Rq~oP2N2lyLjo@2?Y&ov++8 z?}SUkVn^P?3pQ__Twvj2Afdz9*BTOfH6u6oZ~mu9rJbF(%u*+~YM*}2)##d^2aTTE%&m}dFy|Gs^8Cceqn)D+DGwv|UmNB0}6F-UO# zl-V$?X5X2e2UOe+i>yn2V!Zm%ljEIx_oV9vovNC!@A6)gi5?R?RAyKft2vyU+_#r2 zZhQ9YYiswb&p%M%m1^18elp#{j?ZTbN5bUuMLN$8mx?&t;xf3qI5FW-&5qOawrtG3 zJxzGdCb8t8(9oAJUoKp?Zk@7v#nQQJqqi^0yv2BWlUG#F@yAPoG^M0IWjaQ9Rr>mx zt?xY__0k=mRyx}Kd@|X@)HE?NY;~f1BMibZ&%BS;_Tv zvG$ekc0P}jl9KY8b9TGEsYgSFO<$r!?yhz7PdqI;TU%S}vN&*0T>eb9?hU)vP4-&K zR#jDX@5avJ=f?W`emq*2VN!K%x!ZiL6r-6>-0go|Jn(w`{(p&j)3d+*{>#$r$aDC> zCLNx`4%bVSXP;FI3H@s!*8TV4i;IhAo9Ex#vwr8!$mTybzh<_{NJ=LD{q?o1y!^ZM z!-5~X9262(ty(p6*~}}Yd;KqOS^To(mxGPm{qh$V7JlQEHd9fa*dZe)w`}d&w{!OY zuK%W?QM^O-U?l?sgKCLuL`h0wNvc(HQEFmIDua=Mp^>hEp{}uEh@qL4k)f4|rM7{g zm4QL5u#6OnhTQy=%(P0}8g%@YEMs6`kObKfoS#-wo>-L1;Fyx1l&avFo0y&&l$w}Q VS$HzlhJk^B!PC{xWt~$(69C8rLmmJC literal 0 HcmV?d00001 diff --git a/dist/installer/ifw/config/watermark.png b/dist/installer/ifw/config/watermark.png new file mode 100644 index 0000000000000000000000000000000000000000..fc44c44f4c651679158c733d9e5a8a0c4319cd57 GIT binary patch literal 12983 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 + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in new file mode 100644 index 00000000000..ed2cf104c98 --- /dev/null +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in @@ -0,0 +1,15 @@ + + + Qt Creator Application + The IDE of choice for Qt development. + {version} + {date} + org.qtproject.qtcreator.application + + + + + true + true + org.qtproject.qtcreator + diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in new file mode 100644 index 00000000000..122ca71cad4 --- /dev/null +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in @@ -0,0 +1,9 @@ + + + Qt Creator + Installs the Qt Creator IDE. + {version} + {date} + org.qtproject.qtcreator + + diff --git a/qtcreator.pro b/qtcreator.pro index 4720d20b0ed..587f17633e2 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -27,6 +27,7 @@ PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) macx { APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" + BINDIST_INSTALLER_SOURCE = $$BINDIST_SOURCE deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" codesign.commands = codesign -s \"$(SIGNING_IDENTITY)\" \"$${APPBUNDLE}\" dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-$${PATTERN}.dmg @@ -34,6 +35,7 @@ macx { QMAKE_EXTRA_TARGETS += codesign dmg } else { BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" + BINDIST_INSTALLER_SOURCE = "$$BINDIST_SOURCE/*" deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" deployqt.depends = install win32 { @@ -43,13 +45,20 @@ macx { } } +INSTALLER_ARCHIVE = $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z + +bindist.depends = deployqt bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOURCE\" +bindist_installer.depends = deployqt +bindist_installer.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z \"$$BINDIST_INSTALLER_SOURCE\" +installer.depends = bindist_installer +installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -s $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}-installer" win32 { deployqt.commands ~= s,/,\\\\,g bindist.commands ~= s,/,\\\\,g + bindist_installer.commands ~= s,/,\\\\,g + installer.commands ~= s,/,\\\\,g } -bindist.depends = deployqt - -QMAKE_EXTRA_TARGETS += deployqt bindist +QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer installer diff --git a/scripts/packageIfw.py b/scripts/packageIfw.py new file mode 100755 index 00000000000..b78cb548f28 --- /dev/null +++ b/scripts/packageIfw.py @@ -0,0 +1,132 @@ +#!/usr/bin/env python +################################################################################ +# Copyright (c) 2011 Nokia Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of Nokia Corporation, nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +################################################################################ + +import os +import sys +import datetime +import getopt +import subprocess +import fnmatch +import tempfile +import shutil +import inspect + +def usage(): + print 'Usage: %s [-v|--version-string=versionstring] [-i|--installer-path=/path/to/installerfw] [-a|--archive=archive.7z] ' % os.path.basename(sys.argv[0]) + +def substitute_file(infile, outfile, substitutions): + with open(infile, 'r') as f: + template = f.read() + with open(outfile, 'w') as f: + f.write(template.format(**substitutions)) + +def ifw_template_dir(): + script_dir = os.path.dirname(inspect.getfile(inspect.currentframe())) + source_dir = os.path.normpath(os.path.join(script_dir, '..')); + return os.path.normpath(os.path.join(source_dir, 'dist', 'installer', 'ifw')) + +def main(): + try: + opts, args = getopt.gnu_getopt(sys.argv[1:], 'hv:i:a:', ['help', 'version-string=', 'installer-path=', 'archive']) + except: + usage() + sys.exit(2) + + if len(args) < 1: + usage() + sys.exit(2) + + version = '' + ifw_location = '' + archive = '' + for o, a in opts: + if o in ('-h', '--help'): + usage() + sys.exit(0) + if o in ('-v', '--version-string'): + version = a + if o in ('-i', '--installer-path'): + ifw_location = a + if o in ('-a', '--archive'): + archive = a + + if (version == ''): + raise Exception('Version not specified (--version-string)!') + + if (ifw_location == ''): + raise Exception('Installer framework location not specified (--installer-path)!') + + if (archive == ''): + raise Exception('Archive not specified (--archive)!') + + installer_name = args[0] + if sys.platform == 'darwin': + installer_name = installer_name + '.dmg' + + try: + temp_dir = tempfile.mkdtemp() + except: + raise Exception('Failed to create a temporary directory!') + + try: + substs = {} + substs['version'] = version + substs['date'] = datetime.date.today().isoformat() + + template_dir = ifw_template_dir() + out_config_dir = os.path.join(temp_dir,'config') + out_packages_dir = os.path.join(temp_dir, 'packages') + + shutil.copytree(os.path.join(template_dir, 'packages'), os.path.join(temp_dir, 'packages')) + shutil.copytree(os.path.join(template_dir, 'config'), os.path.join(temp_dir, 'config')) + + for root, dirnames, filenames in os.walk(out_packages_dir): + for template in fnmatch.filter(filenames, '*.in'): + substitute_file(os.path.join(root, template), os.path.join(root, template[:-3]), substs) + os.remove(os.path.join(root, template)) + + for root, dirnames, filenames in os.walk(out_config_dir): + for template in fnmatch.filter(filenames, '*.in'): + substitute_file(os.path.join(root, template), os.path.join(root, template[:-3]), substs) + os.remove(os.path.join(root, template)) + + data_path = os.path.join(out_packages_dir, 'org.qtproject.qtcreator.application', 'data') + if not os.path.exists(data_path): + os.makedirs(data_path) + shutil.copy(archive, data_path) + + ifw_call = [os.path.join(ifw_location, 'bin', 'binarycreator'), '-c', os.path.join(out_config_dir, 'config.xml'), '-p', out_packages_dir, installer_name, '--offline-only' ] + subprocess.check_call(ifw_call, stderr=subprocess.STDOUT) + finally: + print 'Cleaning up...' + shutil.rmtree(temp_dir) + print 'Done.' + +if __name__ == '__main__': + main() From 6dad4586c6880a6afc71e1d78555f95736514391 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 28 Sep 2012 09:50:06 +0200 Subject: [PATCH 02/43] sdktool: Fix MSVC warnings about comparison (! == number). Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c Reviewed-by: Tobias Hunger --- src/tools/sdktool/addkeysoperation.cpp | 2 +- src/tools/sdktool/addkitoperation.cpp | 10 +++++----- src/tools/sdktool/addqtoperation.cpp | 8 ++++---- src/tools/sdktool/addtoolchainoperation.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tools/sdktool/addkeysoperation.cpp b/src/tools/sdktool/addkeysoperation.cpp index 4cc898088a1..f87dcacdccb 100644 --- a/src/tools/sdktool/addkeysoperation.cpp +++ b/src/tools/sdktool/addkeysoperation.cpp @@ -113,7 +113,7 @@ bool AddKeysOperation::test() const data.append(KeyValuePair(QLatin1String("newsub/1/2.1/3/qbytearray"), QString::fromLatin1("QByteArray:test array."))); QVariantMap result = addKeys(testMap, data); - if (!result.count() == 8) + if (result.count() != 8) return false; // subkeys: diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index ba5a05d46fe..3f8f659dd37 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -216,7 +216,7 @@ bool AddKitOperation::test() const { QVariantMap map = initializeKits(); - if (!map.count() == 3 + if (map.count() != 3 || !map.contains(QLatin1String(VERSION)) || map.value(QLatin1String(VERSION)).toInt() != 1 || !map.contains(QLatin1String(COUNT)) @@ -231,7 +231,7 @@ bool AddKitOperation::test() const QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("unsupported/mkspec"), KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); - if (!map.count() == 4 + if (map.count() != 4 || !map.contains(QLatin1String(VERSION)) || map.value(QLatin1String(VERSION)).toInt() != 1 || !map.contains(QLatin1String(COUNT)) @@ -242,7 +242,7 @@ bool AddKitOperation::test() const return false; QVariantMap profile0 = map.value(QLatin1String("Profile.0")).toMap(); - if (!profile0.count() == 6 + if (profile0.count() != 6 || !profile0.contains(QLatin1String(ID)) || profile0.value(QLatin1String(ID)).toString() != QLatin1String("testId") || !profile0.contains(QLatin1String(DISPLAYNAME)) @@ -266,7 +266,7 @@ bool AddKitOperation::test() const QLatin1String("Desktop"), QString(), QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("unsupported/mkspec2"), KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2")))); - if (!map.count() == 5 + if (map.count() != 5 || !map.contains(QLatin1String(VERSION)) || map.value(QLatin1String(VERSION)).toInt() != 1 || !map.contains(QLatin1String(COUNT)) @@ -280,7 +280,7 @@ bool AddKitOperation::test() const return false; QVariantMap profile1 = map.value(QLatin1String("Profile.1")).toMap(); - if (!profile1.count() == 6 + if (profile1.count() != 6 || !profile1.contains(QLatin1String(ID)) || profile1.value(QLatin1String(ID)).toString() != QLatin1String("testId2") || !profile1.contains(QLatin1String(DISPLAYNAME)) diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 7ed44d77541..c643e2a6255 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -149,14 +149,14 @@ bool AddQtOperation::test() const QLatin1String("/tmp/test/qmake"), KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue")))); - if (!map.count() == 2 + if (map.count() != 2 || !map.contains(QLatin1String(VERSION)) || map.value(QLatin1String(VERSION)).toInt() != 1 || !map.contains(QLatin1String("QtVersion.0"))) return false; QVariantMap version0 = map.value(QLatin1String("QtVersion.0")).toMap(); - if (!version0.count() == 6 + if (version0.count() != 6 || !version0.contains(QLatin1String(ID)) || version0.value(QLatin1String(ID)).toInt() != -1 || !version0.contains(QLatin1String(DISPLAYNAME)) @@ -184,7 +184,7 @@ bool AddQtOperation::test() const map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"), QLatin1String("/tmp/test/qmake2"), KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue")))); - if (!map.count() == 3 + if (map.count() != 3 || !map.contains(QLatin1String(VERSION)) || map.value(QLatin1String(VERSION)).toInt() != 1 || !map.contains(QLatin1String("QtVersion.0")) @@ -195,7 +195,7 @@ bool AddQtOperation::test() const return false; QVariantMap version1 = map.value(QLatin1String("QtVersion.1")).toMap(); - if (!version1.count() == 6 + if (version1.count() != 6 || !version1.contains(QLatin1String(ID)) || version1.value(QLatin1String(ID)).toInt() != -1 || !version1.contains(QLatin1String(DISPLAYNAME)) diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 01317d7b9a0..73acc045f86 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -183,7 +183,7 @@ bool AddToolChainOperation::test() const map = addToolChain(map, QLatin1String("testId2"), QLatin1String("name"), QLatin1String("/tmp/test"), QLatin1String("test-abi"), QLatin1String("test-abi,test-abi2"), KeyValuePairList() << KeyValuePair(QLatin1String("ExtraKey"), QVariant(QLatin1String("ExtraValue")))); - if (!map.value(QLatin1String(COUNT)).toInt() == 2 + if (map.value(QLatin1String(COUNT)).toInt() != 2 || !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('0')) || !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('1'))) return false; From e834d75b0400c236525e985f0c107d91f192bf67 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 27 Sep 2012 22:30:29 +0200 Subject: [PATCH 03/43] Yet another s/profile/kit change Mostly variable names, one string Change-Id: I9d44cba8ade9266303fe7695b8bc93647710b71d Reviewed-by: Tobias Hunger --- src/plugins/debugger/debuggerkitconfigwidget.h | 2 +- src/plugins/debugger/debuggerkitinformation.h | 10 +++++----- src/plugins/projectexplorer/kitinformation.h | 16 ++++++++-------- src/plugins/projectexplorer/project.cpp | 2 +- src/plugins/projectexplorer/target.h | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/debugger/debuggerkitconfigwidget.h b/src/plugins/debugger/debuggerkitconfigwidget.h index 735d02fd01f..3c8658ca307 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.h +++ b/src/plugins/debugger/debuggerkitconfigwidget.h @@ -62,7 +62,7 @@ class DebuggerKitConfigWidget : public ProjectExplorer::KitConfigWidget Q_OBJECT public: - DebuggerKitConfigWidget(ProjectExplorer::Kit *p, + DebuggerKitConfigWidget(ProjectExplorer::Kit *k, const DebuggerKitInformation *ki, QWidget *parent = 0); diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 93f632be76c..3fdfb165e70 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -77,13 +77,13 @@ public: static DebuggerItem debuggerItem(const ProjectExplorer::Kit *k); static void setDebuggerItem(ProjectExplorer::Kit *k, const DebuggerItem &item); - static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *p) - { return debuggerItem(p).binary; } + static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k) + { return debuggerItem(k).binary; } - static void setDebuggerCommand(ProjectExplorer::Kit *p, const Utils::FileName &command); + static void setDebuggerCommand(ProjectExplorer::Kit *k, const Utils::FileName &command); - static DebuggerEngineType engineType(const ProjectExplorer::Kit *p) - { return debuggerItem(p).engineType; } + static DebuggerEngineType engineType(const ProjectExplorer::Kit *k) + { return debuggerItem(k).engineType; } static void setEngineType(ProjectExplorer::Kit *k, DebuggerEngineType type); diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index ce6a6749dd7..84127020d69 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -78,9 +78,9 @@ public: SysRootMatcher(const Utils::FileName &fn) : m_sysroot(fn) { } - bool matches(const Kit *p) const + bool matches(const Kit *k) const { - return SysRootKitInformation::sysRoot(p) == m_sysroot; + return SysRootKitInformation::sysRoot(k) == m_sysroot; } private: @@ -125,9 +125,9 @@ public: ToolChainMatcher(const ToolChain *tc) : m_tc(tc) { } - bool matches(const Kit *p) const + bool matches(const Kit *k) const { - return ToolChainKitInformation::toolChain(p) == m_tc; + return ToolChainKitInformation::toolChain(k) == m_tc; } private: @@ -166,9 +166,9 @@ public: DeviceTypeMatcher(const Core::Id t) : m_type(t) { } - bool matches(const Kit *p) const + bool matches(const Kit *k) const { - Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(p); + Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(k); if (!deviceType.isValid()) return false; return deviceType == m_type; @@ -214,9 +214,9 @@ public: DeviceMatcher(Core::Id id) : m_devId(id) { } - bool matches(const Kit *p) const + bool matches(const Kit *k) const { - return DeviceKitInformation::deviceId(p) == m_devId; + return DeviceKitInformation::deviceId(k) == m_devId; } private: diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 28ebdf373f1..0fd4265785d 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -266,7 +266,7 @@ Target *Project::restoreTarget(const QVariantMap &data) Kit *k = KitManager::instance()->find(id); if (!k) { - qWarning("Warning: No profile '%s' found. Continuing.", qPrintable(id.toString())); + qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString())); return 0; } diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index ad12c27ebd9..98a874c1575 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -59,7 +59,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration Q_OBJECT public: - Target(Project *parent, Kit *p); + Target(Project *parent, Kit *k); ~Target(); Project *project() const; From 23c3f61d1a7fd62b15f73d50e682f1b812422e36 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 28 Sep 2012 10:13:56 +0200 Subject: [PATCH 04/43] Add Autodetection for system cdb/gdb for kits added by sdktool. Introduced special 'auto' value for debugger binary. Change-Id: I5be4fa148ce9ded06826a7dda647c5ba402dc70a Reviewed-by: Tim Jenssen --- .../debugger/debuggerkitinformation.cpp | 21 ++++++++++++++++++- src/tools/sdktool/README.txt | 1 + src/tools/sdktool/addkitoperation.cpp | 6 ++++++ src/tools/sdktool/addkitoperation.h | 2 ++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 5b86f09c323..f497e2b19ed 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -296,8 +296,27 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const } QTC_ASSERT(v.type() == QVariant::Map, return result); const QVariantMap vmap = v.toMap(); - result.binary = Utils::FileName::fromString(vmap.value(QLatin1String(binaryKeyC)).toString()); result.engineType = static_cast(vmap.value(QLatin1String(engineTypeKeyC)).toInt()); + QString binary = vmap.value(QLatin1String(binaryKeyC)).toString(); + // Check for special 'auto' entry for binary written by the sdktool during + // installation. Try to autodetect. + if (binary == QLatin1String("auto")) { + binary.clear(); + switch (result.engineType) { + case Debugger::GdbEngineType: // Auto-detect system gdb on Unix + if (Abi::hostAbi().os() != Abi::WindowsOS) + binary = Environment::systemEnvironment().searchInPath(QLatin1String("gdb")); + break; + case Debugger::CdbEngineType: { // Auto-detect system CDB on Windows. + const QPair cdbs = autoDetectCdbDebugger(); + binary = cdbs.second.isEmpty() ? cdbs.first : cdbs.second; + } + break; + default: + break; + } + } + result.binary = Utils::FileName::fromString(binary); return result; } diff --git a/src/tools/sdktool/README.txt b/src/tools/sdktool/README.txt index be6f2225ff3..9e21e73cbbd 100644 --- a/src/tools/sdktool/README.txt +++ b/src/tools/sdktool/README.txt @@ -119,6 +119,7 @@ Add a Kit using the newly set up tool chain and Qt version: Tricky parts: - debuggerengine is the integer used in the enum Debugger::DebuggerEngineType The most important type is 1 for GDB. + - debugger can be a absolute path or the value: 'auto' - devicetype is the string returned IDevice::type() diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 3f8f659dd37..4fd5104efb7 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -63,6 +63,12 @@ static char TOOLCHAIN[] = "PE.Profile.ToolChain"; static char MKSPEC[] = "QtPM4.mkSpecInformation"; static char QT[] = "QtSupport.QtInformation"; +AddKitOperation::AddKitOperation() + : m_debuggerEngine(0) + , m_debugger(QLatin1String("auto")) +{ +} + QString AddKitOperation::name() const { return QLatin1String("addKit"); diff --git a/src/tools/sdktool/addkitoperation.h b/src/tools/sdktool/addkitoperation.h index e526bcb6044..e1910674b32 100644 --- a/src/tools/sdktool/addkitoperation.h +++ b/src/tools/sdktool/addkitoperation.h @@ -38,6 +38,8 @@ class AddKitOperation : public Operation { public: + AddKitOperation(); + QString name() const; QString helpText() const; QString argumentsHelpText() const; From 0c13e640f1c9b5fb5f0238432143ec8ed86422a8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 27 Sep 2012 22:29:13 +0200 Subject: [PATCH 05/43] ClearCase: Fix capitalization Change-Id: Ic707363021430ad9c8b1df6d3e3e3b444967d08f Reviewed-by: Leena Miettinen --- src/plugins/clearcase/activityselector.cpp | 2 +- src/plugins/clearcase/checkoutdialog.ui | 2 +- src/plugins/clearcase/versionselector.ui | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/clearcase/activityselector.cpp b/src/plugins/clearcase/activityselector.cpp index d677881edc0..d0fce680109 100644 --- a/src/plugins/clearcase/activityselector.cpp +++ b/src/plugins/clearcase/activityselector.cpp @@ -54,7 +54,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QHBoxLayout *hboxLayout = new QHBoxLayout(this); hboxLayout->setContentsMargins(0, 0, 0, 0); - QLabel *lblActivity = new QLabel(tr("Select &Activity:")); + QLabel *lblActivity = new QLabel(tr("Select &activity:")); lblActivity->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); hboxLayout->addWidget(lblActivity); diff --git a/src/plugins/clearcase/checkoutdialog.ui b/src/plugins/clearcase/checkoutdialog.ui index 73f6a398c52..3af4fa0eeb3 100644 --- a/src/plugins/clearcase/checkoutdialog.ui +++ b/src/plugins/clearcase/checkoutdialog.ui @@ -24,7 +24,7 @@ - &Checkout Comment: + &Checkout comment: txtComment diff --git a/src/plugins/clearcase/versionselector.ui b/src/plugins/clearcase/versionselector.ui index b120bcf944a..d6afca55901 100644 --- a/src/plugins/clearcase/versionselector.ui +++ b/src/plugins/clearcase/versionselector.ui @@ -49,7 +49,7 @@ - Created By: + Created by: @@ -63,7 +63,7 @@ - Created On: + Created on: @@ -91,7 +91,7 @@ - Created By: + Created by: @@ -105,7 +105,7 @@ - Created On: + Created on: From fe1f97ce434f059f4eee5d4dd0ff1e5c6e7fab8d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 28 Sep 2012 10:41:36 +0200 Subject: [PATCH 06/43] Doc: experimental ClearCase plugin Change-Id: Ia32913d0fc76700502c7f25f4fcb987b784e104a Reviewed-by: Orgad Shaneh --- doc/src/howto/creator-vcs.qdoc | 44 +++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 337a45ca77d..2ec977a9929 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -41,6 +41,10 @@ \o Bazaar \o \l{http://bazaar.canonical.com/} \o \QC 2.2 and later + \row + \o ClearCase + \o \l{http://www-01.ibm.com/software/awdtools/clearcase/} + \i Experimental plugin in \QC 2.6 \row \o CVS \o \l{http://www.cvshome.org} @@ -304,7 +308,45 @@ \endtable - \section2 Using Additional CVS Functions + \section2 Using Additional ClearCase Functions + + IBM Rational ClearCase is a version control, workspace management, parallel + development support, and build automation solution developed by IBM. The + ClearCase client plugin is an experimental plugin that you can enable by + selecting \gui Help > \gui {About Plugins} > \gui {Version Control} > + \gui ClearCase. The ClearCase client plugin is available on Linux and + Windows for accessing a ClearCase server. + + The \gui ClearCase submenu contains the following additional items: + + \table + \header + \o Menu Item + \o Description + \row + \o \gui{Check In} + \o Create a permanent new version of the current file or all files + in the versioned object base (VOB). + \row + \o \gui{Check In Activity} + \o Check in checked-out versions in the change set of the current + Unified Change Management (UCM) activity. + \row + \o \gui{Check Out} + \o Create a writable copy of a branch. If you check out files in a + UCM view, they are added to the change set of the UCM activity. + \row + \o \gui{Undo Check Out} + \o Cancel the checkout for a file and delete the checked-out + version. + \row + \o \gui{Undo Hijack} + \o Resolve hijacked files. If you change the read-only attribute of + a file that is loaded into a snapshot view and modify the file + without checking it out, you \e hijack the file. + \endtable + +\section2 Using Additional CVS Functions CVS is an open source version control system. From b02e954eff366bd10d672c756208955d1f934813 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 28 Sep 2012 12:45:10 +0200 Subject: [PATCH 07/43] Fix command line arguments for installer generation. Change-Id: I5b204936fbfc6073f32769ac0bf2196c26b40483 Reviewed-by: Eike Ziller --- qtcreator.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtcreator.pro b/qtcreator.pro index 587f17633e2..c1e5fa0014b 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -52,7 +52,7 @@ bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOU bindist_installer.depends = deployqt bindist_installer.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z \"$$BINDIST_INSTALLER_SOURCE\" installer.depends = bindist_installer -installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -s $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}-installer" +installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}-installer" win32 { deployqt.commands ~= s,/,\\\\,g From 7e9913f0f540e196ca7e53217d2edf19a9e8ef29 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Sat, 22 Sep 2012 14:24:43 +0200 Subject: [PATCH 08/43] Fix crashes when typing code Problem was with cyclic recurrence. To solve it we need to check if derived class is different class than its base class. Keep completion corrected. Include some unit tests when base class has the same name as derived. Task-number: QTCREATORBUG-7887 Change-Id: I7973c0b06e3b62d2da3d06048f4327d18a0b8011 Reviewed-by: hjk --- src/libs/cplusplus/LookupContext.cpp | 23 +- src/plugins/cpptools/cppcompletion_test.cpp | 275 +++++++++++++++++++- src/plugins/cpptools/cpptoolsplugin.h | 8 + 3 files changed, 304 insertions(+), 2 deletions(-) diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 8edd3b30ca6..e474287d199 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -789,15 +789,37 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac return instantiation; } + if (allBases.isEmpty() || allBases.size() == knownUsings.size()) + return reference; + + QList fullyQualifiedNameForReferenceClass = + LookupContext::fullyQualifiedName(referenceClass); // Find the missing bases for regular (non-template) types. // Ex.: class A : public B::Type {}; foreach (const Name *baseName, allBases) { ClassOrNamespace *binding = this; if (const QualifiedNameId *qBaseName = baseName->asQualifiedNameId()) { + QList fullyQualifiedNameForBaseClass; + addNames(baseName, &fullyQualifiedNameForBaseClass); + if (compareFullyQualifiedName(fullyQualifiedNameForReferenceClass, + fullyQualifiedNameForBaseClass)) { + continue; + } + if (const Name *qualification = qBaseName->base()) binding = lookupType(qualification); + else if (binding->parent() != 0) + //if this is global identifier we take global namespace + //Ex: class A{}; namespace NS { class A: public ::A{}; } + binding = binding->globalNamespace(); + else + //if we are in the global scope + continue; baseName = qBaseName->name(); } + else if (compareName(name, baseName)) { + continue; + } if (binding) { ClassOrNamespace * baseBinding = binding->lookupType(baseName); @@ -806,7 +828,6 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac } } - return reference; } diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index a6681bb3981..08e14bd67a6 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -231,7 +231,7 @@ void CppToolsPlugin::test_completion_template_1() QVERIFY(!completions.contains("func")); } -void CppToolsPlugin::test_completion_template_as_base() +void CppToolsPlugin::test_completion() { QFETCH(QByteArray, code); QFETCH(QStringList, expectedCompletions); @@ -253,6 +253,11 @@ void CppToolsPlugin::test_completion_template_as_base() QCOMPARE(actualCompletions, expectedCompletions); } +void CppToolsPlugin::test_completion_template_as_base() +{ + test_completion(); +} + void CppToolsPlugin::test_completion_template_as_base_data() { QTest::addColumn("code"); @@ -399,3 +404,271 @@ void CppToolsPlugin::test_completion_template_as_base_data() completions.append("otherMember"); QTest::newRow("case: base as template name in non-template") << code << completions; } + +void CppToolsPlugin::test_completion_use_global_identifier_as_base_class() +{ + test_completion(); +} + +void CppToolsPlugin::test_completion_use_global_identifier_as_base_class_data() +{ + QTest::addColumn("code"); + QTest::addColumn("expectedCompletions"); + + QByteArray code; + QStringList completions; + + code = "\n" + "struct Global\n" + "{\n" + " int int_global;\n" + "};\n" + "\n" + "struct Final : ::Global\n" + "{\n" + " int int_final;\n" + "};\n" + "\n" + "Final c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_global"); + completions.append("int_final"); + completions.append("Final"); + completions.append("Global"); + QTest::newRow("case: derived as global and base as global") << code << completions; + + completions.clear(); + + code = "\n" + "struct Global\n" + "{\n" + " int int_global;\n" + "};\n" + "\n" + "namespace NS\n" + "{\n" + "struct Final : ::Global\n" + "{\n" + " int int_final;\n" + "};\n" + "}\n" + "\n" + "NS::Final c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_global"); + completions.append("int_final"); + completions.append("Final"); + completions.append("Global"); + QTest::newRow("case: derived is inside namespace, base as global") + << code << completions; + + completions.clear(); + + //this test does not work due to the bug QTCREATORBUG-7912 + + +// code = "\n" +// "struct Global\n" +// "{\n" +// " int int_global;\n" +// "};\n" +// "\n" +// "template \n" +// "struct Enclosing\n" +// "{\n" +// "struct Final : ::Global\n" +// "{\n" +// " int int_final;\n" +// "};\n" +// "}\n" +// "\n" +// "Enclosing::Final c;\n" +// "@\n" +// "// padding so we get the scope right\n"; + +// completions.append("int_global"); +// completions.append("int_final"); +// completions.append("Final"); +// completions.append("Global"); +// QTest::newRow("case: derived is enclosed by template, base as global") +// << code << completions; + +// completions.clear(); +} + +void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived() +{ + test_completion(); +} + +void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_data() +{ + QTest::addColumn("code"); + QTest::addColumn("expectedCompletions"); + + QByteArray code; + QStringList completions; + + code = "\n" + "struct A : A\n" + "{\n" + " int int_a;\n" + "};\n" + "\n" + "A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_a"); + completions.append("A"); + QTest::newRow("case: base class is derived class") << code << completions; + + completions.clear(); + + code = "\n" + "namespace NS\n" + "{\n" + "struct A : A\n" + "{\n" + " int int_a;\n" + "};\n" + "}\n" + "\n" + "NS::A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_a"); + completions.append("A"); + QTest::newRow("case: base class is derived class. class is in namespace") + << code << completions; + + completions.clear(); + + code = "\n" + "namespace NS\n" + "{\n" + "struct A : NS::A\n" + "{\n" + " int int_a;\n" + "};\n" + "}\n" + "\n" + "NS::A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_a"); + completions.append("A"); + QTest::newRow("case: base class is derived class. class is in namespace. " + "use scope operator for base class") << code << completions; + + completions.clear(); + + code = "\n" + "namespace NS1\n" + "{\n" + "struct A\n" + "{\n" + " int int_ns1_a;\n" + "};\n" + "}\n" + "namespace NS2\n" + "{\n" + "struct A : NS1::A\n" + "{\n" + " int int_ns2_a;\n" + "};\n" + "}\n" + "\n" + "NS2::A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_ns1_a"); + completions.append("int_ns2_a"); + completions.append("A"); + QTest::newRow("case: base class has the same name as derived but in different namespace") + << code << completions; + + completions.clear(); + + code = "\n" + "struct Enclosing\n" + "{\n" + "struct A\n" + "{\n" + " int int_enclosing_a;\n" + "};\n" + "};\n" + "namespace NS2\n" + "{\n" + "struct A : Enclosing::A\n" + "{\n" + " int int_ns2_a;\n" + "};\n" + "}\n" + "\n" + "NS2::A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_enclosing_a"); + completions.append("int_ns2_a"); + completions.append("A"); + QTest::newRow("case: base class has the same name as derived(in namespace) " + "but is nested by different class") << code << completions; + + completions.clear(); + + code = "\n" + "struct EnclosingBase\n" + "{\n" + "struct A\n" + "{\n" + " int int_enclosing_base_a;\n" + "};\n" + "};\n" + "struct EnclosingDerived\n" + "{\n" + "struct A : EnclosingBase::A\n" + "{\n" + " int int_enclosing_derived_a;\n" + "};\n" + "};\n" + "\n" + "EnclosingDerived::A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_enclosing_base_a"); + completions.append("int_enclosing_derived_a"); + completions.append("A"); + QTest::newRow("case: base class has the same name as derived(nested) " + "but is nested by different class") << code << completions; + + completions.clear(); + + code = "\n" + "template \n" + "struct A : A\n" + "{\n" + " int int_a;\n" + "};\n" + "\n" + "A c;\n" + "@\n" + "// padding so we get the scope right\n"; + + completions.append("int_a"); + completions.append("A"); + QTest::newRow("case: base class is derived class. class is a template") + << code << completions; + + completions.clear(); + +} diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index ba88d11896e..554a1877832 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -77,6 +77,7 @@ private slots: void switchHeaderSource(); #ifdef WITH_TESTS + // codegen tests void test_codegen_public_in_empty_class(); void test_codegen_public_in_nonempty_class(); @@ -95,6 +96,13 @@ private slots: void test_completion_template_1(); void test_completion_template_as_base(); void test_completion_template_as_base_data(); + void test_completion_use_global_identifier_as_base_class(); + void test_completion_use_global_identifier_as_base_class_data(); + void test_completion_base_class_has_name_the_same_as_derived(); + void test_completion_base_class_has_name_the_same_as_derived_data(); + +private: + void test_completion(); #endif private: From bbe08f156da7821c797acd85227633f1b4fac435 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 28 Sep 2012 14:33:26 +0200 Subject: [PATCH 09/43] Update Overlay icon in MiniTargetSelector on Kit changes This makes sure the icon is updated when changing devices in the kit. Task-number: QTCREATORBUG-7938 Change-Id: I6d5a07993593084a6226cfa044bb899d74cb5e15 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/target.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 2554d4973e3..155cbb32bb5 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -188,6 +188,7 @@ void Target::handleKitUpdates(Kit *k) setDisplayName(k->displayName()); setIcon(k->icon()); updateDefaultDeployConfigurations(); + updateDeviceState(); // in case the device changed... emit kitChanged(); } From aeca8714b56f9b0e4a31574dc37947b7c595eb24 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 28 Sep 2012 15:39:42 +0200 Subject: [PATCH 10/43] Doc: the Qt Quick 2 application wizard Change-Id: I586a669995ca173648783bed2f1e6ea675aacda3 Reviewed-by: Kai Koehne --- doc/images/qmldesigner-new-project.png | Bin 20287 -> 42644 bytes .../qtcreator-new-qt-quick-project-wizard.png | Bin 20073 -> 42874 bytes .../projects/creator-projects-creating.qdoc | 7 ++++--- doc/src/qtquick/qtquick-creating.qdoc | 18 ++++++++---------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png index ac8e4e15058ddb44b93fda989b98db4e5ebcb937..acbbc37893871dc24789c10337d01450f3c70ce8 100644 GIT binary patch literal 42644 zcmeAS@N?(olHy`uVBq!ia0y~yU}|MxU=-kBV_;x7mc_S|fniy+r;B4q#jQ7UBlAU0 z3bnre|G9;YTX7>t<8il!;|&{b@FXp*rs)etq-bFE4}F zwac&8ySBUh{iWO6^B;Ccd~mh>J=L%>=120KBA#t(S;fDrlB)}M1<#qixIk`=+E4dC zyA!z|rmOvXbYJbCfY^x+^DANhGV)K=2)wKRDE{B~_siS+ZO^~& zw>|Ifsa^H|>!RY~-0Xv2a_`*7FK2UL=hm-JPe#d_HOba0s^{m(S=v1h|MoFt%kF)1 zyq}!6{Q0@#@#Y=29j`y#&(V{M{wV%G?Bnst`qw6J;=i_xU*7J@(fmo?+y5;5_u+e` z^WO*OOP7lNpL<;Xme;=tKk^O#bD3MV92LIy<=5BOCC|^z{qpDM=Re2J#p#|qdp2=$ z+vao@gZ-Dvz8rPSFDx_^eJsXRYpD0T=wD3u_5C8hKWx1|UE~>yrQxAJ&3jI=y%m@m zDbsxVk^PK6iRHZYIyIk*KfgRNQTgS`$?6*EzHu{;9M0WYXF7BJ*X|#i{e}Mp=>I%! zS9rhf-v3AX{~qo4{iB_;=hdXDUtcn-etbxbv-oLTYiw*B5%TfK*}4j*<4iKY9z{sj z`kqKO-WMDk{9)@qfqwpvTfeq%wc7UPbn=xbvG0keKbQU}w#nz2Xa8LO?DWruu6DjZ zoO7S@cmC&l+V7h8?5NMJ&FTJDB`*T1K0oulC(`%dbY9-QJ)Nd%`(5YEoqO~pd(8!Q zr=C6M)~sE7^H*cljkBMg?@|8uw6yZQ$=-U4b7}QyOJ6;5`BQlJ?ceiVH92vQ-hXaC z68}f~^ZE-X%_7Tq@9wP@&;L?z_Wy;A0grOywmrFjMEvbCwS5({GwkM=AAek@leN5R z`P^d(^6!M7T)v_I>G`ep$je)~}JZD3p+u^=;>u_nWRCe@^<~=JfNA zwkX?QiQ7@2*xS>yc#EpFy(k1 zDE-5k_Xm67@8bW(@#%XC{2uMM{gZgKzWww14FQ7+8z{2+FG(?x*Pm}$%qD#zrvBZXohE-vZq+F} z>0gsiJ1XOAbKmNpoccG@j~0UUU*13cd)_YQS=FiiU;hN^|9f=aaHj07=;QkjB}Iy} z_}@4`&vtXX^5oR`*kkdI2cQ4j(6C59X-4h~?wR^6>c1|C&vyFqlrxIwT<7rxmc?^p z-B)!VO|Jf`x;uks-u#u9D=zvz+W7F}jUxMqkN4~TZFt1*{a-N2_Fx-7|3Zo4H(w%d z?Jj@+-n{kuvP&NyA20rUYtFPF`LI9bmjAh=br`f-t#lUMXxLlvk;(t~jVTW$#P2g56XY?= z*t!1k`=5_|{w#g`3xaLgJ-mlNC;@`+`FRVE?`{%^^8Rn}~t~eYy z->>;^@ALkDkM2AFyRg{3|I_S4KU;rp`Ilz9UfbE(`KLuiZYl5aW0lDjzrMUId3($B z$CK?HzyIA}zrROL)}}&WzWR|zrynnT6M63bq#fPxn5ue{xmre`o7P`zvAp zHayyY`e!&BtNX!il1H|dZp!C=+U@Pd zPx7x{JNL7)*7wf2N0qa;?s@gA(p=^9^Enn_C%Zls)F#*(3iln&nPLA)^uJV^-|QdX zC)y|Jp3z^j^r`A;{r|P+kG3A&vg^}+3-8mJRaI8=^Umy>_4n=mJ(HfLJ=Y1VQ;3a< z;rh{Dv&Yi(;rUgM`K3QT|GGK)-x|N~^(Or*V*lJeEpPTHzwE+K=iKN0yVm^-FF3Zn zHt}^x-AiUM|I=m~Kcj9gND9x|_f1>&RQ-{8_O~vG+nMQo`fw~Y@{ihA8R6>zCSjKG z`8@i5lXp6Z9Dgc*H1%K3OyiFn$6wmkpVNKT|I6%?`<%R=(b3UAAMfh@^YHY>Jyt(H z)O*=%*QoE3|CH`p{Q1?cr{_O5ZB;sRG2Z_1@B2TB&&)k1pZiGvpJ4sDZ0{f8939G$ zo0o0klU*sV6B~R}{QL8hn=iC2uRhIv{n>Rx@$|flGJDE4pIJKjl+5Wndw(qbvu%d` zvC>yg|L)v#`)4!Xs{Z5hJ=F*9&+nJttXZ$Uz0v+vul=br_j8WScm1qnZ-0Hp{`&vZ z-&CH-`&oV}@Xyix!qp$&bN_#qUEi7;87A#7($W5G^XSjx8;|t=@&1&aT=${<$owR>Kg!zz%>VqcEIB{_?f$1SXC?n0 z-M{^hV6pX&!(IRRp3MLMZKI0kBo)s|TXu&&^p*j!R6H-On`YJuVNN2<_&a^??>Adl z-8y9PkMj?c%DxNc`vj!BSXDKW4z{i6)Rhtq30UlA`0Yp&r&}kN(zkUQW&&^aif>TR zy1^^NXD!oirvLfA`C40u)FLVS=xaBt)S<@yTEFl2yWO8os?VR&$}K*v{9fhp>@3;vHJ^{m*XR5d zhFJOPebmmP)SrJopFjQk{r>oU|Ns5|bUT0lRQrEFl(+Vswu-KP{qN=S`BnGL7X&ES z|NRmixiu^F=f~snQ!7KC)$YH-Z~rI3?$=-W)gZ^Nt<-oTp&Pwz&7Xh2-#@(`U!Ut; z$>F2%dwY?t#K(QNvyR_TythvCfL7n{U1wbVQ}a}dd4IEsFwI}T|KF}X-)?0;Z55Bx z=oZ&s_w@7g^ZM)e{aTf;+xL6c5mDhArK~&c|NVIU>t)FL`~MBSmjh1RX=Z;LAzj)tux%Iq^6Vm6`hDpn8ORIf5`SG`{d#7#v zed%BEdE4-`v$H~z_kKJkefrJK&8M09Z4~0SuYY~zS=MjW4V8y^%^PA8t_Dkg+HCpC zWLa5#w#&0)G7-C%dQZ1n_w=mA{ffuETe({w9JPHDTYh)zoce!1Ibl&%lNx_q)@k!b zxx`O%iqA1_yd@I7qgp4zWZk^@ZxIY#pQ5%U9Ax^tYnhyWEE1G9mY$Y+;ppZS!{9?YyTem(L4g+YtHxSjry5vd^o|*8O+a2W5e|3j^$!42yhD zY?LYadNurX?17EXcD=m3yxHKn=gyeLYcmd)ehS*r{fb%GZ{Z)2ox&#=-O}8@bTcd2 zo6GAe?~JnxU9V~QV)M4ryQSAxy8pV+_R;lSX#ARAOFHiEJTddERZ?$J^2*%1HJ{IZ zTKia{eyw?9=T>>^*6)n@ z9kAlFW%08qjm+#!TV@zMotmWXJ1gYdjpY7U3VGY_mZ`464Hk7qLB&ch zKbAPY-9aC!FqYjOc@n@Ba67or=r&zO#>os@BRPp_e|+`6(_HYM#R=ab3)yZSPNZdblo z*uJAKDS3+oySp%to2)_T=XbH?cSYIyEsij7^t#_Oi}MLQUUSh^Jd@jaM*10Ly;2Fs zXHmAfv+Qepf5`KKcG)tG_j|w3%a46zxNg@ zQcK~q?9P?J%dh<@db{=dsqJ6?tlfT3E1uC|!{e$;>x?YdAG#>)ZzK5h)7(3f=U*l= z8>sc4`Y+@5bAGgDI9o#D{v(%q!u8mvH|Rb(&bq+Ar^wpCWZA9jPfkvL8a&~dZ9u7? z?Bj!cJDg*mE;tv{D*R$k9n*?Nbu~fp3^Tr`$JhmqG8q)I2V9dA2vv_*aogzlFD}cx zb^0sbN(XfGFivbZBqgTs;?au2hyQ*)mlxsZV)QRPqqpM$lfo0Jgb?v(J0ACCPb>c9 zQx>~I*xx45-mEmYezLEb=I%F}xVNAC++&vadHTL}D_iQ12)Y+&9*i&E^lJMO<8v0y zJ2}_g&tl_|2;j5*a-rzQ!}jj0=FD%4G>)bScOE<@*8JTpkM(5jx0}aj99`i5PR?3Z z2sdyb3^7H;5EN6xI){hx^?yU}9@O1-V^NQ!aoggIVsqV3h{ETB>~aG) zrvo|%`aOje*lVURs{6@TOg{f4_E`Hii}dU9^?Q#mXW-b8{9uQlZ0ZxM0}^kGo+#<9 zlN0x=cHnP0xtoE%p;5=sZI9_b@%S1+af@qytoyw6cDnQ|2#LAH*qqd9n8Z?Q*txB7 zz168^|0ijNtQJi^XBdLC@A%C&<7JQ%FFsazU6T36Q@5%SAUc!5_@#P0W4^1S%>Ow)%ZzWS2=0oYJhHkQR8i?%AQn z9ch-!FDzj{5^5xGQ?Y@SA-BP=zG1E8^s{M-ciGD3-ah@YdAgcN)v^n36LMW-%v$18 z3cob0>}BVQjW+)?u6siR@1wIcAqRR_hc5n2I0X zI;vm))TH6a!^{0KXLT6E6gX;DzJDjN-RE`>-v^QNH&#BMw)_wOJcn5^Co(4&f4wTm zHTUu~iMaZ|Ukjd0dClFB#OI*)-DrMK|6|F34$douyauT+RtN`V$n_kI_|UVvnXz@j z%|BA}Ew8ja?y&4pQj=s}b2}j8Uhm0@HIskbxf^nC`+^Bc2N{KycMBiWWcC)1t5_Jl zN3=k$=7Zyb~6Oa9}HtT)cb~}&TXXi|_Nw<&J@gyz2{@VO@ z&Ss&29Y3GVz8zr}#Ck*6&*I?b)?Z)F9%n1$iK;!k@}o@YmB7>+8xntAP>*1lYiFR7 zRs6!zGjHix+3iznIX=$>w-EpO2dtPQ&2ef+?x)Fjw89(ZEu+s({CwzR5qq!UBA?i= z7CGm#gWr9Q(_@}8PxA|x$ia!xYaP_)xCd}N*rK`os z>wFT1p?4nfYOwS%wm#_Ze6sE1(&=%pq&7-e3z(_@VrYHD*5EU*tF9h3&vFyGt2=w^Qu)FgN8+|7+a#I1tH`*v zF<)2Vrp4Ff;OF+J33`3I}61_k2m8^J#^IryOtk zv`mIvzipFqK)oXkGBm@Z;5jzvoeZ;r{vEA*;H%m>2%_NtBjbRF`icmUS(E+ShOM z7UlWZPP{S0{XvLdcHHe^oz?vlt@f&KIG&h&+~e(!>e28NtQj^!@DH9w#3_95sUAvSews1?x z+%4IrQoR>1|BT%+flqSr%m+1l{x`~hes*^E`I)bGzyEW8r@VUyi(`snT}RZz?wZ?P zsx{*4=c{at7T{D-I#IUlVJSzT*P=Nw>_V-c$K1a&#q&GmH14-C*~`8*mX?|Q^7h;A-HTIdwOd&8;I$Wrq6$~5fFy5I|It-1<=9*vG_&)+`S$kq zo=NLG7X?6M9eZSyc+%6-B>YeOK5)GoVr`R*ZAeQ1hvKCekx3WgIu>jSy`3;E_rYs- z7O{2zZ)9wKR>1JKVMt-@DS^# zulqLT>ged~cpCQW*Ds5>4uylI=fC<}-`B*aZOqKlyuH1hme_JQ7-eqQ zyJydtuWyZV?(8n_Zj~_pto0X+?YJK61 zP4SC1^xgmRe*eu^r@Bt22(=o`)Vb=acrK))g#CES31^W@wmyfG<_I@kaOb|+uHfS# za&OPi&9c8gDQ9Q?y>rNyU1!>{4~*Ga|E}!&|Ij!)<4*eWRr@!bh%Z)~>?v|8WmAY) z>zCN$=c*1K+$U3;c;9b<&x3Tn&LwB2)kKOYF(tby8eB7Q46HcXH#ObW^d~&umw(uD|~3)j$8*lKV6Bzq{Dq z&yEj$yYcez<9row;QwW;o;%3e}5`JC*{`F{hP|v#lF3noj=Ogw|DCF>F!4}_8v996`h;A z_IKe%r3cz<+g=+s1AUEOW<|Le>X_AOt2JSsZ+X1hX()4DZl&UBvW?BvXQrI&Q^ z-n~BKr+cH#-<_DKeC^t`V@B*9?&f_PH*LD)CN9S+PMOcN_N1u-ve@G$hq z(42Cx@!+;ES8rVlzr}77$E|z9d5M$g7J;ve1x-cIe*06lY0_uEceTv;m|EMYnS;_K%P zCw3M;Py3g5$(i4Fil6P*5C-9jl9O&Tx&Hjqx?6s~R;+!d`o&92y)SP{J$-5I_IqA@ z5g(rVnm?akzptu#9n+EZDql{j&tGEwZilk(Tr1Ip6OTXLNbX;ny>2I4LfYOlpHkXo z%L3f;P9JLJZmj-4kvDRm&Ce&3PZj#!+#@bF?^f`dE>;mStq_NY9?ecn3PJ~c1qGj! zWz8!*Cb=&?aqr_k>t(Ok@3+&9-)Ey6x5q-Z^2x-=6ZcE6$2KTmFJ!Cv{dW8OJvNVj z)?|F}RG;f|GR6DR!*+Q+e|FQfr`IlCoXBVQBcV(GxncdkKPC4npEJ(Y;h)m_$4e`7 zfyuH31(%oU2U%~*c=c-4vu}@fzVusAU>k5lN|Y&edQ6e$s>^S;-=DY4clI>7$|n=| zSiE}q(zCSc&&T7R53LoQTm5cl=Fu)u&e)2Ftv~dd_b%?UTE(ekd}G&xCT@n^Id5OT zee3JN!7*=+ak}5GKc7yojyU;Vz2vg5`O?kjth8-EpD}*fBJ6iUA@}aCQinvn|kPdKw-hEy}#^EcP#F=+x6YZl}3If~$%zN#w zo_{2uks|o?=!vkio6p->zt__baY$U~G<)(1>rbAq+W*-9b5vCIv~U*+<`8+e@wnW} zACLR}r^l8_u5J#k-WInee*e6!jUU!MTD5QLqoqICWlI98UaefdDZ%1F1M`!&atRZX z7AkC#{`K?ueE;8XHuF!Pn69Z=7@{Nk%4uf0Yw;05_YE!^Y}!~?ESbdS_4rs&#>dN_ zpS?2qeUkms6>Yw?NnHQ0h>2{fimiINbfsU#(|gtLS-U>{_k9%ijBnj>mPfWJjz=H$ zHR%6g*}xd@8?Yi?Z`TVYZihc}95tAJz1#QuUCR+2rrIBJ0<2F2;>!B#Ql5sh#j)R! zsi}F;$ZmFe^9yE%NY$_U0$g9D_={K;oVmVk*Q-?<`Zn22Qa+}8dKtTXje%n6Mh#s^ zm~_sm_V&MEnWAF(qI%D_i-)8$o?K1Pd9YRT|AGLWc$MA<_ZVMr6dX8fx;{?vhyA}F z$-Jk#p6q(PPWekI$7;pbtv{4b9ViwNN|<@~+~;R!Kg&Nj!NmBcvhTymX>F7J?PfB4 zpYvL$WsS@fc7<27eoYMts?WUB;H0p6`}etyfa%w%ssG)NFLtlZl(ae2{&rhuD zWaVNlb8pI9zvq)zo_udHZ@}ky5lu2PKF>CI)~EDBQ=riQ5!ch>K^~66_om2x7d*XS z%H4#?>i%h*j6yrtZn|Xo`Hb;VzCa!arR`?ijNudcuDyH}6y*7LsUdT#vHXuTRi0b& z9((KlwpYe2?v-ABcW3CF`}dFXY*X07G~=P+(~WN!BX22$FgpaDUv}wOy;#ye;UdN_ zihH!ziO-m2k{Q(Cv}eYA?oBtC?6wBaW^_9+sYrZ!Mqs;qBtN6e0TGSe|Ns4tP2c)> z*0Jv~I~^AODlpgfpTUtmzwlw>hEA3hBIPGOrR(Sz?OgkKYSW|slbm1KGd^!Nzf;h> zBlT%?N1C|lCe7outy~&9AsIFeP7C_ek1mqYnDSyCue6zuPC!O^vPxIu?P=X@4rRX0 zJ8O2V<|w>=^#7gW^R_pIDsE*i->7m*zx>b?&EQMR=hwZm+vu={-*Q{QwKb6~yiccx z|2r;Mt<$=ghhb9ntVx0%@9MiIRd+BI`FpDJPB}9*kiE5AZ10SHl^5$Wzs+G^Rrx!k zsw!^kr|12jzNgQxUSqZT!?iD`7PV$7FNk_-`1^SO^49$`=HHrlRLp>N3FpxbjLtc8 zKQS(Pd3pJAwT+t?^VU?Xd3EP(M-khl2#MS;1@et76EeeNKiu#LQg86)G0CDjN2cDTpA>$W+(D0u&~>V~sn|EGssO1Lzm;ZXmoii7Uy_a@g_ z6h~E6Jo~=NMECE8Uvo?!?|wP)_dCD-d-l3_>mF~v%zHg%Ze0xHl69-zSm*E2tPN}2 z!^q(wbU1q>%Y}`1_`NiGO*lU@NX$O+_jFa{iiSf>T->6sn7LYSU5#HW#hLG;5s<<9 zKUCP2=fp;_8?Gn!E(wlVe_we2@7>ql&79;Vl_OOf&>_R{H+8C6ZRA3Wm-d?V|FVO< z{{JcWivMH%_j`AJSh{eYhphhIIl52ouUr!w&rsp4aNMBt_idRYTXRZpt0c<)*c-su zs?5pNDr8w6oY7=#J$J5UpvMm3yT?E2%4AJAGC}E1lX>sg>IFw-XQnz{%UihOe``t4 zwlfOTTUJ~+FScL%yCdGdZF;J z`(W{@`@u2XzltuaeLdB^?0@KWZc(iT8{P}b9_l=Dn9F*@#;!z1nO_AR+dXUDX67si zDVJW;V#V1h#BCoStFz9AoyGd!Nke}d=D$qNMZPOo`J=Rj79}25yI?qLNljvMiqr(= zGm|GfE5seO5WcDue1pRv+To!EV{5}5k0k+T_Dv7D^vq*1D15aR6ofb^{@ZMLk?qJd z!_5q03M%JBH!9s)sQ1oBWYg!IR?{0iM_)ae)f-j)cI)&Vw=9&jn$OlUC#I9{RuYxkH`GDFV;77EWZEfLuJC|%-YNRr?w_`>$tqi zS}av?j%met<`%8lr9tu>nT$_*BtLM9teXFq#caM(sX%s4@tnm=ugqkf%4+P#TX5!@ z+3lRg^%0SgcCSlC&+8n!QSnP(=j5@-+MdNbBOM-UG&sq=n-IO)Xuj%HlZlgMNJ`@{r!Mh7wZ9Agm)TF|F)xZjs4XpaG-#KYE4Y|_&686?ybISLtqBIbVBxp+d3 z9g|*8(-u$8{meRM?l+e_iSd1R%OYKPK~O%!GS5D@uH=P#3Ok(g<+xczCYft6T=TPj ztMY~E$EHXjhk)gF3B}*lto$vN{-duP7|45o1`g?%0t>j0ZyZ z*=_Ok+r4wjRc4P%=RdNkIb372dafYNpUUvRaL%+U%b5%YtQB+To@zQFwez&z?hR_z z^RH;K{@T)TC~$+wEDyG&OD65(u4Db+$ZWJyPaq(2m-8eX&GQ(e7`e9I zHuPm^4YsLCcRhVzjo+^ZZz+bfz--rs&K>Sy+nxC=Tee<~u>Nc^y|uwLy@l;T_u{Qb ze3|a0tiPP$)x>>88|;cq=Gr+V9r=F0zP@s|T7L0C z3yXJMGWrV&rZ_AtF7?uS`Fetzl*q33MRy+k-nv9rZRY!De`ho}iD`x@Ut6qJXl})% z=^)%K8NhLYVe*MEl_?gV4&oinzse;35oafFp=QDMiPe_v!9m^AJ% zi!g2PtIle2df-(pqj_B@WAhZNN1PVSYZ&#Dc{P|#PHYUk^Q@uI?zx)Vno_=5`HWn> z$_q}diqOAqQRx=X(0VcLKxDkD{V~bar??$f^GB+0ogO-o+v?Yh)QzBm)LUz1!=XuD zzpNUaxI`x;-0j*PqbdF1f!EsTTMc~quOF@w`PI@M`EiG8HpLlgGYx}>r>ow^j?u%PVsx-;+I=pRtuyWLn6jBP^|Z zSwp6UI3z|hUCEIX@IJOGMVRIE3|>B+21f>#*RtKh4;(%QZPJNP`p&@KzN)x>_c<@~ z(pOgkHq8?(em=GDAA4NH?VPR?4XZpIWXspa9z4+NtL;09-+*h)CIKdM2gU{LJ2p8m z_4*!ox&3j*73mvHR*j|)I&+xjG1%k&^3JJE42SQF z1nh`(Ow@Su>ho9g>Pz0Tb6>ukK5g05*!+;sU-tex!0>&_57p!GSDssNJM2#1agt@r z?B9iZV>y^O#PkwER`yc4V*JQ^oj?+>`!4Rh)Kc zBE!1MbLWiJ(!O@;{tk@05-a=X+kC5?azA&6$8xRESx^wMK;T35@=bhte@nxwo;^)n zS$y`_mV%?vFRz*{F!&_qogAvC=Jkg6dSB(5eGQX#-md9e-EsT4v0eVYpJ@$@_DB94 z)1Oz`tKAiSs$8?;$lg22cLF}{78PK%+HpL>DQeqYW2V#FZ|7MbIQM>sp8p>in>SS- zlBcZPFB|`GhhV~mLxDDvpD*55D%lht%Wbe?euK(W2CtYf!@5&lMT`C~@~J$rSu|jC zK`8q>WB1a6y_^--&(HfB6MIf`x-_4~lXsVvzk9lhW!2rwtL~rBOJ3mf)9clpDW3bZ zooyt|=k~JS$(>>zzT)}f{8zQImAm8~-}d9v+TL);sg+AZW=d;+l7h_KY?XV;F=Boy z;>wDBj&~SNxBi#WPEZ$NJ?7&3Lf9-x_f3V;k|Rt8U;FEeN#&=Ms}DdMEC}uTywf^ERLFgP_QY_}^Q2?>{a!%s8N3 zc_8T0ao+W7`<^mv`OC)jc1}on5&HpQ<}{fv%iq6Zosu~{y}{{xXDly-E1QcL9wug+Q+s{f9Zx)~TurSGLtQ z34Qn^@5pR>T?d!^`@&`}2ovFt>~R%fQxfAPED&Asw*wdhNA?(ik4 z`E?Vng*I$>J(u_8T7G+fef_t7tK;6YaYcWeaWWHJl1oA-t`I6ctflQ}l|hge0*+bs=O+!WmJeVQ)mt5qQOx9UHr85diTzjM z)cvZHEYtn?rs;e-b9BAeGi^D^hMa91Gmc!Yu#B6Se%$2W`t$4wJqu6pW!isSaaM~} zgil-~NFZ#_8Zj301E!gmRJ7Bb+8-rNWcU>EoWt>u%n#)^YtlI7oMxsrJymv4bQNsY z_Gg-Oq4z<#td4)v^a&yIliM$Fi}xMYS$oUZxZ5S+y73gP2W%-1?85?6tyk;b*?a4J z*3vviu9NHvSGQUSxyb!GbLfJ!bcD;)rGJ0K%+KVXsaQY1f#2Zts%3g*)j>8t=DA+6 zeZqBA@Y+R<`8q{slSDHnH5k4Poi}&=t9+X;_N|NMnMJDn>gFYP8uJ}%7Y$~*G-dVs zL%UY>=~VqXH)G<$d8^w$uq?QC{FwHdNhvcnmfzhoak-^GTQtK9^<!py);kcoEyH@f+v2=TK;$9(MH!B z3MXsCei<#Xy5hLJRU!7i{KdBwa{iZp{;)ikY7!Tnzt^<#8vBj>tyjYiIs7?ty<$Vd zp~NPq=JeL{ObiZ!QDK`|!enp!4v zu_n(t_4O)AoC_wb`FHi8?K{;IPqgI^^|m_93_Cw%#vVp@F7KIZX0a%+zOm1p%hH6e$UWaxB1vnr=Wj#mOoO66pa+$BCPRfT9`Zc-HO{zvLZ}A z4)PnG&ib{o`}H3FSD6#N_PvaLaN+NiN&jCjxNzfT_%zbntFP&693=T{!?AQt?I92RGHlQN$7FL z9yeK$N6x>T% z&+gx6&~GcPaHII*b+H-GCjChNS+UIX$LTxC7q@$GUEthMY4^&_ZMJsFZdSg%ydf74 z|2UT9|9fufjXOQf)4wE7s9YtR;;?7$u|t=4DBB#l;UX56Vi@c2(7;hqado0ZXST<2 z;a3tSVMm+h@viu-!Fq~uhmj#i?o){r=4FRtj#r3G4>d`3{vqVUvhwQsP_Baxi9$gw z&N6FW)~%CgULaGt`IqVg4dwfWy*J#ivFWjSF)@UwHF!8=aI1aUf70!Puuini4y^?n zcr|#$_Knk6oQ^7_Z3`(MfnTS$oFniHDfX zJ}fh1jAYS1J!v1~x;v*|9oj0BckbD_s8iEkZ``+8{Qe_t?zIe&pIBo)NW5me@YL$4 z)-~U_A66BUV-B2VF?V%bHi2Jc{c916O5v}e?x&9aPnl4cd~h?zm;L`P<{gsQ(PK4P za*DyvLsk-8GnCSguF3CPxZ=uPn+Iacc@CfQI`^T6AxUK8CJh^}ko&9l?^{ywb@6je zZ-se#n4TyxmObGM;9n8==~riW_Zeoh*$V>hztk=@pC`t7?ED-<{+`L(W=pSIxqRQG z_J6EVQ=Z0cntJqT#Z3EopDoo4Tc<49xYRl#^{isIR9A4Vgh)f_`xCvc`~``BJ{lde z{^cmEQDc*=_dW%oVn{CMgAJI+h{*W7K`7`y%0L_W?3X)-5y{$KQc zCRm&LFSGmovGtidSq?E26w7}&V(s8^g)@GZexh#j-M)zOw;7Y{4m@U9X*HqznSfoe zenQ~y36%@=KhFC3{<36!$%dbq=c?`%?|Yq|+!(R>@TcW(zvNGG_A}+|zi{-)#G^eI zbQ&%+x!gQ3VrY0N4Q5P@50peW8RyT?6Jb5JjqzwP(+$HeBg2WFN`We20eL1w~>C2m340iudt=jVF?fr0tk9Tt% zYu0rc$Na2nI5h1~Dr2%-kj$Dl&y*Ipo_Hu5R`mVqK^4V!l79|my_e)_S5mG>{@3l# zlP#o}|1X%QMStFxxdQ1cHzqK}X>9AL?f%9zQD;Jh;Qt3_J35(-7*_m}Tyl!dERtWt z^3SSu6@2p<%_?LJ3g>^@$g?r*#OxY@Rg2zDnO`)Oe@)g{@2CTS2`Cl>S@@$Wt;PdZO0ec39D?LuG()U zEnMrUC>fo6A&Z&+=PBt!o47o(l@-n(O5Mni!lH4d{M1#s+6BH(RuvZWPjF`oKCv!y z{yvtBzw33M&E9n4UdHy1m-eUZ{3j#)edF^NypLP22s$JwKDrfF-cql7OEbPj{>t2@ ztA5{KR_|iVFnoSSx0Yi=w9l0j6|(YiYGlQB#ani=%}veqcp^z1)!Ez_UDyV&#g#Ozb9 zANexBnmj)%xI|u8El@{l;;)CB)e3JP+w354AV2N^E2GKT)Y`hMXr zyH+@k@zU1yZUr212PZqMsmf4~`*7Fvsd&JT`fu;@uXbv8J^tZcv0Q^otBXU4V_!4B zl3jakW89Z@H@fd_37FutvNddjuI^Iv+QnDSAK(u&pP5E``k){h^5kD0eV z`q2|v$)Iz)Ux|r4{`>A@{X5(06Th^o%i+V_517ZMc49hO}{Pvl+jJY>w)UMt@o~J=e9UL-N~dTV%7RYGWWpyf9WSK z>3zysmhoiO+uYdb6>{q?&Yt(Z_xtC9Mp@g^^Ofs2RIGnBp>p2Zw+6qQ?qt{eJ^Or* zzIOZK#aY$mOM9R1{&?@j8pD4Hd=9DA67|B@_iR6=eE;gFPQO#{y`RRvpZf0Ce~Y=x zr@8WGU&%bQX4m#*rGM_*u5AA&$HK+9#zLTychlD74XW={+;=?v+q1{&sKV=z4>CIs zusuG{y!z4 zFE2SMr7>mwyu*t9&N)ot&_H4ko=9sl?7^PTU-=ktZ*)?4Ih z>|qhHI`wY;$>bmJp7XE1|Nlq!C#8RXFGhcPxZOVN{+`kdTYLAqUH7`BlN0!&ZCAFa_d4E4D}J>kbMm(RtG868{pMZBKmYn}pZAXD z>(f*u^Y59qnI2zgxM7bsPgNUlrQuaogQMAJx_ulJm2=+78Ze38viF~|?cLlxPs8R{ zO)E@W-!S9DYL4mKyN*xld(il#)#%UZ2cOTKl9w}Q;3zn-%5t>=hlu35b=<*Bnaipx z&N+!V->})z7WGnLu0vc&A#)?6L|n~fja4k~Y*zcu)Ye{?!1JMF^8Kgs3=c!6?f>|J zF-d7Y!v>?t(?6Xv*lRiap0eJa|BYtvIZI}JKK{_S>v!d>N{z~w2cr7cG1oj|(|9`b z&m&*RlnvX%*e9Z)(@x!yagoh9FC81W?$zQVk@Sb3JJ?iu_q-73 zSbX|DZ)@$h!g$`+>FtM73qJmDbyQeB^Udp-&WAf+->^!$n`qM{?0Z1?@L6S+eLS8< zb8aoyWNoW|9eG6ISb=c?3**OGhDRbL4nAh}Vc@bokWjrpF-<{z-M!a#A55h(ozL#6 zFKM?ih*hv+-ScrDqv1zZt7R-7qP)02uvj{ziWEM{6^?IEl6$1Ab56K=5|{pM7r|g% zh8r5s9(&6BOZ<3va9aKY?t;dZ74eQ)pW2UK*q{>_#&9u2aKWk1>U9j}yIC8O6J~vH zkWIR$o*~Wpq|xJiwK%^fqxYWOr*554d@jiNZW&Vt^Ijea-|Ht9$qU$W%$UOVbD5q* zA;Z>&%LV%@7`Nt}lUuLM!7tJ5RX8#HP^LzX#+%g(3z9W*^o!zoTdU^C6-+cc1zH`rl?qB`g?67d# ziSEOvH?N%$mw4iejZxdqr#Y+zAMbsVGZ%>y;$qcP{{8Cp75&3pYDMq4xFp^8&#&G0 zt+Y&BdHFy2&(E$tx@mCZ((yZQnYp5){9=++%J^EPs=ZIo>?~XI@B7W;y1KlrAk5pU z%iHSC+bWhE@x##i`k7_d#k3+S7Th&H6|P${nN|E*?z`wUJGM=B6m>|_PxyGlX^q!5 zjiUl@m#sea);x2gyK|y*qPI5~Kdd|Y%_M9=pAuh~=Izaw#k9gc-^xG#y_8j(*-n|q z#&+ZMo%wtT8@#ISKl&n=YSfnhb?w@iZ34wx*WSBV;y5AL?M)y@oivv;S9FvV*XoZO z#pPA+T)GtSBR)}Kt->~0FWdjq&ASUry?S&LkEm~WX8rrz&AOw{&Nts^zEEcTf4bf6 z1v*U2l?A4=+_+hHRIbwUsfv0*B(L`WRTH0Q7N>1^TU4XAZTm;QT*ff(% z+11l)(z(SRDBjOm7%YCD<9J;CH`gr-KXVv-<6+hRbnn@XM`s>qRm)jTxv}UNr`xt$ z4+}-jZ|}Hq%Ke9#Mn`>qpak zd(B&Soix5=Yo4>jJzsu@>W-y9Bw2oLj$r$A@2|MPFPC{oA6#G-Z!MJO>pq{lea{Cu zuK9+O%iiD9h;h@+{3+jg@P^91cY^v~z32SV*LiyU!5k40t$2oG6F$AMe4(Ho{lP@? z*VcOZ1QmrtcIB6{^zGyh2Id4N7e7+nc9XocVZy!s|V!jP8xBfD^y0iNGyPF2LjPE61-C6x);luRmAC>FNIJuSz&$*Rw z`P(W`zd+M$gA#*Gy z6jw_+c1`YRx8R%P{496D>g8vRAH6y6%D|{0@Ymry16-h0gr+IPqD)O zJyHuVY}oXDMfRS~5|N2;GI-qDQ~UJEO0zRJ zf){)_aC>`xc#GiUg$V^ZDihj|Y)rVdOL@nW>F3wS?_V}qg8QZUejbw#pEz#+-s^tn zY2!kJ%+ELfmIyWbFaJ1UjqQ4|g39Zsr|Y+_-pAoA$@uuC(z&9r?G7^wS{2Ve^8SB! zPvzy9O_BL)lJ7_)pMS~|{xfGG3v+bKzbBR}-J<_#+Mn-U{P^0G{I*wfgdYC2iMA=W z(*5KoyIQ@nA>QgnF?*xaR{;;t)#rTA{d{W5lHzi+k-hTYmzTi{CRSNFB{l^8o%42! z$9_TG3r{r6Dg~Z1C!bT(%+Ec)cb{}(?9LU-x5l1`zJHWiD|TM_uFmg*yFA(b;#L}$ zzq>QhPQB$qXtG6H;?$F0em_3mzm@&Fulpm_H_y+{Z#J5{VAlt>DQjDu4)1C_^vC~* z;Et8vC4QZ!Uud$F-D1@U5iev|FW;Yj>1Bk|PuUfh^`5ksE&03rvHSP6%@uR?oiBP; zJ3s7nP&~T!;3xc>U#noOU@VBGjGfN zE5#r6lPYx5CxtC$Ire4G*=R0~pj(nc%v`rt-Iw$`Y}_z)VoHsMiJNH7xo3tuigd1P zSf+=~3;rT$blo$hM#5cAxXoGSfT%KC#n#%yu6&zT1;!NtOTIA8W!h50wsfN12c5k_ z1&>cA=QK`Mw0!8* z5Lmb4l=k60m-5$1GuwD2v@lN5Kh-2SC4bMc14}!0owR;pXB86FD!StN$|qZcu30@i z<@3uy^RCbORqCglk2}>a&#&Bfh5h*CmuF5q-|M{a*D|?`?N&VJUWZP5HF1ZKEN^bZ z4{iCQ{3Rcc^&X1*aKN*BkGaXpzZ$bUD!ks$IT7vGX(`xd(>a*PbwiDV9 z_((NcoPYB7_xDn#Co?~{T{X;Q59pa!=e+sT!Oio6w?Ca}CcA^-)S(deJ?B@N1jp{L z`@8F#$+p1U-ny>k1{2oyad_YBSZ}p9&O`nObLA`j^Gj>Km#_M4o_D8U{uk@^S?RT2 z&$nh@Z(2J@rlWV_w2G8QA&VzRSzm3weU(9cu6*$`hj|;65(*PnP3Cjov&;Lz3cb~z zb7J-duWwnKw@i;w{`)I|j}^<;HJX)r$;MgVZM+`l&i3NB?c3}BKZ?Ba`5?mOZq1x; z&KR5HU)3PUx;{m(Z> z-jlc>t#KugSLD}Tr-hp)ufG`hs+F&W+oD1LtH<-{4+Gj3XgGgW7P++6#%OEaDeF{b zgVJ?JyX!)aALXo&Jl5^5;l^d~@!1M-1qPeu;;+Yc`_+BU`nrDU(uD>70V|&SS)O7L zcU@qfI>RF1#ANrAMrl(Fo!upOsRwWf99(*j_50R1&3+}-cljdo?`eTFLSE0&+(ti&Y?Vw5*4kqx z(y@(MXG^n|U9(>9VdDi?jH~`u-96xbuK)d$z5~FpHXtLz`p051(o~Do6YaVGI%flF|VELLij}SNAm(XC$O>^ z$FLhTT1=QKHjk%LJLV&M)*)pD$rr3g+ynh9D<%1yAMG(?`O;_*rm_0sr=wuH)OTlyQ8J)crOKjYG+O94A{s@96IpKtCiS}O2& zYCu<~_H3q9g&hkXE0z0;EaJIT{OsPf&FrN-65mUDcvIaxk4Xd-?P*|>8)b@O4lX5DOe`xwxa`O6p!g+0*Th{KqY@87Jt3hH0 z>yuAj5+%K#o>mI?87)a(a@EG?DQiIGafY3n%nmWOtde-jaPc1ZztW!TfyMO0fyQGvlD&Z>niykI%}|0Q0A-7;ja(Geq7wR zZ*tt>X9}0jKRUv#q2pY6Nmf?7zVue*qQ-o1{|(fSd&n9l|60ND!hs1B)9y41>3>_c z`ti};?_GxMWqTZ?c_%h{8Kke{e_*M`sPZV(_2-AOz)8n-rdS8q8V9!D3chjaQUC~7 zIBI<1c|X@8Kx7IFzoPyfSDTxM?o|nAI4?Y8r!-N0@w|l!yqmS#g9ComE;>1H;RTyJ zXO^y69{uC~2HSkid;|XN<65%`3yH$6s`u;RmBS#}A^XHZG zc4GSB-rmj+v!~B6TnR2^-&WP+>pF8_}*2RfC7u^&(5mPd+{IXTiwIbWi)76CvxDLxi-ahcb zAT3(dAYJ&A%(R4k%PW_M{hqBCB(CwX;F9CKjR{)6S({idyf#ltXZjp=^k(t13+!A= zZeQVk^w;$4vzL=}UQJmyt?f|Tp=r}Vcyg=L+e;I(ZYAFR{`p`td)pM<45sp{m(OiZ z3*=cptJN&w)FX-d&6V4)zDYQFrI)Mq)?QZ=27}|fQrFvSf73l8B)-3S-<(;@yBOy1 zUgS+Rekb;cqxt)VYj)crC-GYzJNHQC0DHh+KCTyP+{<1l9*km0)pz>1N#eAUqVtn~ z)8$rQ(_JO>eagP_fWtmhBPY``SA!*Pn|o5g>XhA!1iAixy}7Dt z1M8DDzn+I~j@(rC|HZ|{Iahp{TDP^GT2(mDfqUl~H};xsZ)Q3eGkxIUus>BDDsD)t*^%qWysc5AHcl{u+!=&E*rdG=gy z?|c0=imlIn&k*_5*R9AjRe9=(*#;S6nTaibWVal(77V&(w^3%IlVWXz=1H~*u3|PH zVwZ@VbSV*Jx#o9XTf9(tc8h$HuFo<)2a{GGCz+|OZGKl-S@pZlFIL@J$-t5da9%n z_ceFN=dn{f1q$siKYMty`1v_rBj((2vzgszH5qo@-|8K)YRLub`hPY}mM@kXr=L@C zGg!U&b2~3*2t3q`JQHKK#w^O?P)@MBv!O%i($qhPPAp`2`>ed-h3bmRrgG(ibB`43 zn`Sm&>DJ4x5YL`nUig;l-#ej>=<}Y;9T#@CD0TA%opO3EqxkpGC-vXF-HX3WekJ+j z6W0-6-P1kA{ii(Y?#C>v{PV-GNkCHJ5VIod`^#x>y|(Es2|4%tiF}yZUp5Y7qc{1k zo{64`fil5C8I2oX6l9AY}si-L=v2j^5UW-dz2&M4}$tNt$9mJvH&#_qRW`CaOgQ z?^u^M(Jyz|4z&ZU>N>}DSXazpJ`|(E{q)6h=JVdCroOu=awqTA10hCj{_IQoZb6Dt z;W3T3_T?}q-Z?v|)9}q^#VL-NnI(nU-Ewt~xJr z{>!;^wdsjhS>EBu{?aM?ie*LaM$MhGO+>YoU4e04>FW#C za~U@sSSyu(CxP#<^@nq|suOZg^jrCCy(+2ve6@_(^RP+U6-y8O{PgtngKe`KN@~tI zyj71sa#Ha}^SNxx%AI$1Tskr>I=gS@OvxKlE-}wm*zT=a^!(Nr;i50y4`n|^7K<09 zpVHjZ!@;S)Y08evsfu}KPwb=_B(KQdTK9gZ@=lvx%c^vh_xIOtf9xiqTlUC?*Qqgrdy1->NTblCil9e^ktN5xf|cr2gy+mI zIM;kgsOvz|GvV$<%_q)Pb(D&}=GI=!dbV0;37^sHEe%Uu^TN6=?iAu)zRjZLO+aB_ zkcGI8&a=bM&(GK0rBi>b?AT+KE50YXSk{G>KcA`d%Pe8{?%mxi8+rHD{#KjQnr58RVrPFyll@3OY3e|JbQG4Q|gcXh62$`(z3Hp|8{PO{2<(w+`-8H zjCWG&9jo)M=M-C?S?Huf?sWa1=mNza~t2to?5n^*nZ4;t^X6Dh_hY=tojflUtz2Z) zbbHUOv)nA^a%|#4s|oUvU9;WQeqH^2BEah6UekQc%qb%| zQL%j51vd9HTc)xfh};`-NU`9>ooC0@ULI^_ceZZQd61Xm)KH_y=+Sn2+5*03{4EOt zlb*Hr&fFl*(SCMP{p{mRjQ%?ppLKliGVN2|rW96T{j-XHjwC0`7B>rT+&J;ey$MdA z90Sf)>IJvBWeA>EFyhE7x~sN8-zjUK@{U)_Wa^hsKa-kh6Su$a?5$Nknx_!6(+8vt3vw}G(zj*cBCnu5@^VeK)wLU5TGeq4eP_J9h z^3wh%+>G5THs~Mw>EAMElYr9QQ<|DOU6T$yy&&=A)H(?!F*dF#N=qgrKi!=C?Ay{8 z96gJcp4n0KHbB$$eBg|hC*@rATvM!4Uy99ouIYQ~(xK%w4zKQLd8>1FoC-=TbW79p zDqWDVwb5zGpPJ+EQv_Emx9XZ6Iz{9ia|{1R?=@Qloc7+vE%KEvy4iKmz!M_bvN>DvTF0N+LM3hcFas`Ms87|#KmnqJ&ETur8%8m2{_KS zFETlQw19bu$j?6?9yaqX{I$_)R`s);WmWgSR|;tawXjvn%wPXy4(}6(EslSU{I6bq z*4wi;-uBAH>J#(M_L|Nfl0bArqUt17qpjgypSA7j2bQ80t~dreB`3#s^${yNqt ze2%8;1Rk7FQZSbG-=sdhCsajf;pcLN^Va3>RtO(zU$9hX(`H7wd(8jN{aPWjw)FJ65i%i&}56mfbz|UFXKp+pg?~q#~B=ocv~z zW{$ls%fI=d0*w!@KDaUu^?ukAiX!L|}=4QuD2c({BdoJ9W z@OYA;#HGWmXD1#1v^F>SyYlO47HN(}OO;H_OdtI92=-X$EBadelM5f?ccn!yEQ>38 zB3@Rq&8c?QxVNu%b=6csw-A+sqoFF)9YPZ;$Qk^2ZH4|=0&vaXVL*-V^ zrj%9UPuKg*PBb!=n{dNWGv%%8qvHuPZK}Vm`6w9VAwH2aGIKv~VbIo#u@@&QwsNR2 zrOQa$d(7RKCSxHqx#r-pQ#WeY>1s-EX_tveop^fEp+y>+F}w?zc7*CyNxkG8R%<2=H2k~)^!Z2r<+RAe?$W=`T4^ITQ!=iGu1B9b0| zu_tTsJQ~KY5;vZTFW+tl4V(T#~&9s#ft? zx*bl+exudC#+$2q(UOAt0HY}iOeaDY9c*;%4SKY1p~Tw@nhx(1163@%uIPHQ^f9HX zE_|Y~FSRsr?vfHkg_Nh!cN!PyMscWb=f1?@p{U*SJt#&@{h*(`U5&*RVVyPeg4MET;>Lv=Us!)%TBn!b zvulE&;`tv1&PtqOMPHpN1jLJVTX+~94{=d|h^oAP#b)ERRWrFByU2lU4`rQkR1TXB! zk1XBF%On<`8|?0KOCsgu=86Wphj!anZ19=HDQ;7#R5CGE=fJN%xn+xcoW=aVeyb}r zOl#N^ktgU`YuNN&xvfO;?()22B1~^27`XGnHRieg{L(oKnJ3tB&9z>kp=tBv_HnTg zZWE@a3`On859!Ba7Dr6zGS9yk@j&ogWN~0@Z|OQemWL}G&T$<7@hA7r^y8AR=1E^z z&U1`6X-%!!`xC#kVl(e4oY0e=DZXaQu@JBw^Y|jZw9a~9_UN9T7Z?9*kt#OBFFdRZ z_)aKj%Y47LtKd$PY6fq{|A~`irUhNwX(*U__0c)oXBYgJ8*SLT@%z8O)rxfyK7Xt8 z4wQawm)^f*gN7HEzj#R#pSBm*|08#fzq;CEb#y)>_XWpd`RO8Ju3$U+JQD-wBuoKw zJrm)52{2=d$TYBcAef=rs@m!r2=4l*wz_&gd^pibIOc_<;k~rlBN8H7$Ev#*E&0Gd zV>(k>_s$vp_1zOSR98y$zIMuxEmTi;y2~1J|4C#Zli99=`X}~O%sejo%Q4^=vy+-i z%F6}Qm$v*6Vu^pYxc2yr9}6FC<~pIT@Xt=5x+L>CA~h?Fk>& z^e;HN$uEGzH8AK0`w|0@BY!R~cJF?DeLc5~UUgqb)DSgqup0o4&NC zPi~Kq&}6*y+@@P1N660iz%S*qTm9X$ZpU0$JSq4L%gxq|#se=n{x@=LZun-@!@02~ z#>-A|T6WT5wF`Ux32%rssEwSE!aOP0Q>j~2ASUkiw7v1K+!MEZfpemz=AN>*x02G+ z(@!wg6n|ef-`n0i@6Lp>ycOYrQ$+sR>+JGKSYRW${*0+)W5i>pJx79SzQ3ER@Nx3N zyR1F#T(*a!R8kX*yuI0H9-Wsbuw?eS4ponD;$hbH_5c3t+_^gMaFadj`RZx!5~ogL zmR1x{4!<^E^N01NN4phUgM^N0dA$n?QZmjo-m7XYE~GoVH=RZ8|BsK49bB5$$M4^? zqEmQQ$&63)e{-birRfJLJ)WTBanJd$bx<-jcfl{uX4`qT*tlGGJ`}P}mcklf1eC>U4^RhDW z?REdE^B*-!+}m4SZXcAOY{t*#DXRSDhZ6sIrFN8D5dL!XlBr>4$i#Kp;p;ZYcnMoPnJU-p>b1)4 zt!vZTXpZjh>glGdZ!Gtpzr<4J&awuD)!f;Vu}Ze8PS1DiBt6JqGw0;>wK*vh)=koy z#Cq+!pliyfZ*Oncy|Pvb?Q(U=P?(=waNO&nr~N>`I=#`mw2vN|4dAfA^Nl z6#3us{JU5_wIE4QraCyHZ>y$@)->B`p|$F3*G-wB)9$ghZn-^k?e48xTfeNl93b~& zU3$G!me}To)4%Y)R>TtCJL39r zCn8U+Rrs&oIBQE;)#SzoL8sj;bF(Me)&44xHA+lco4xP)zclZk+>;MQTUU42|9O4u z(f0p;azEbQ|9{_&n{GVU)mx{uob4$*ZjtrVPyclATU6ikNh_M6GI#HTuo)?-&qfF+&`hdiSg8toK1@Fj@Ky!P3hHiy*0QM&zB3J{4;u+D@L{WXkuCdVVL=JcSuZC|jY1c7=IS(dnLmB9)^k4YdSf@m zzrlFBe9NGgzLD$ot~gW$#bR~o=hkd;*58B z@_L85vQ($x842^Y#qA}I)h%;cN`&@Z44bU4|J1GDl95mQdSM@9>kS^h$oYMp`yMao zlea%-cy#3{;m31c#`PTtu0MaoXO41Ux!E4!qa$L#Jj_GuduO5~Ll zT#o$wIs1d6x?BBa{W;sSZ-{??)7`jEDB#4q;#W#s3|CWEw~gn!wH)sp*fy@~qH{6kDk?9_KL3!9%$CW{7m$aivHR_?b6%G6ftewTfFW$^Mp zVY02RFS+emdl&-W@C2-gshi`MlGOE*Wz*l#1K=;&+f*X0Sj& zVT;0qyUEv^xtX{&?mNc5=Cb2M2@Mm8$=VB)OGKEp6>l_r5>Tve4rX7t-aPkKio?qq zE~#IoAr?ZF3@S~mhSHZd%FS}@=FM<7# zT=@=bMWH~CMsxO_WaTM>%K|uVvP`(VMEp<%&x?$@8AVg%kHy&=A1di`4rg0%>f-FV z+5BRvPk(mXKDc2Z!7^Km>wsh7Cz%co#@Z(jK&Nj9$(yy*W%vJ1@RLYNwBFX3oG|~( z)Uv9+SFeo!UP-;{xRBGLdJl`ptcVTg6X!AV?(&}QlV=lLl~-fV?b{$fS>~MNgGq6T zdnBcgiR?9cw})M+hVO=CbkVg%&yQ*DjWt}_75^dn>8DVaebRUH9Tyh5&Hu^&_1oUU z7g3eP4hj=8WwPTBtvqy8a<&7P{58E*2ep#Kd#k^f)W1DmpxM9gLwBZe{mJ~*yZ>Kp z?PGPB#8I0x`9{P(i4Ol0Qr)+?>QA3bS;YC_xp|4e57v~IHquXOf3>)L>HL?fUch5z}HM`JzRTF~L%T>(q-3 z;nqbab?QI2nA*vdPw(aC+St_2f9Cp=xwo^P_s54s-`l2?p#Rq}(bFT$b`N`9ZT_CwI;oQ+uEp-SYPw{t{_F*3PjLNW z`I5Q$J%bPfpGHuh%wd;bFBm6qoUr|RC3s)_v-qn=pEHzp2q=WrN*!F0DI8{aLvep% z{U0@-z3Hst3|n%}-Vif><+AQ*l}i#h1!)J=ZgGGiVlkeCCR=|bo{WGbB|2I97m_LQ_B`CJit4x<5$w} zj@K8?vrV76^p)Ge#st43K0%TbCA7Hir9N&tr0o7I>$$A3>Bl3brXP<^zqanD?bg>f z_TBn+Db2) zt#O{7o%Hz?!-+ua0#4Qk(ern$udmhruB2o4H|T2f+9vfE8rF<8y;FsGm{__Zc8D$9 ze68yH+1267X+@4#(mop-8w=T;<&sF@JCf5bXr}$#=Z<{R`8O~3RQu0-n#g_elhuX2 z7OX$R=2$*oIhk>*nR@HReBpDJ$)!pMR?KXB5^ZdApK&o`YnsQYiA!D|tg7gVm0)iO zogH)dLxR;=mDtOv$$BO?Ym=63t9`ud*1wz6ubr7#yY=bW+u6U%${`R7-s(pmA<2|E!Em7nfj|+lCjH>HAiUo zqow_S{APc3{WQJdqTXMZ$$H^iH`uS1&0c5h`9^(K3}1l8&KRdMmbv;7#ea^Pc9N%v*_uQci9334lAPlPU`GW^=P7~US*FQRpLDdvxnYsdjVCu# z|IGTLa%S=b;RLpVm+T6Db-g#YZ`veeAIR{ga>m}4sSKJ{DrX*T=9utu*P3s=d`w#p z$d>i(^^mx+m%;LFs&dO7p*XY6>G2E>!bX!mOy``lUu|YdoGqifV2_sM-e_5aYB=gh4WU#Lt-VNzZGv?kdnT3@T@*{;*N ziJzZzZ2di-aqmR$kofBry><7NHXqW9wbIzL&EMpqkHu$iKBWe~bKx`Ad9$~!W@wdA zjaI(-@4%yFpZCS6_pFY~7WA3Xd6L^f!Z|0^A&48a zbwump#$GjtDKFSATy;!jZ+&h2pk?o_l7Jmv0U9!zxd&G5yt=Q&;kR5xtd)k0pe9$4 z>>M^H`Q0I^smk4YOKl=_%1pVcxjACh7?w1#UPE-37l$$+`wbinDM)5X*ZobvCTU|WkPvkGvkGQkrNnO~& zXqOWwPba5aPtoNMpSSv#z~99=J9qukUX-(QjUB)7J2|`He#70W=HYp(S!cfq77Oc4 zO0{10h^D+D-}IWH)fM|gI(bHj2__= zo!J`2FiC{7@`zYL1JWDC7F=!MN)WeT`qywWFd!pv%3L;`51YK?PHg=k zD6vW4?Egp;O@HwVn-aKBbgx)k=My3IV$)M;fy|Gp7gD>`{vPOy+LERiHLrPFB!l?L zz;ZvejU1vHpKNs4E~`~H+~T=aDwvw;E>wDZTdwqjmGL@Ko2?s5q`zKCOTO6RxU*sB z=iaX?4VVA>Cig|=>dd|G7Hohd#W$CpwsLXZmHu%s=&8&T2H9OXTdfzc{Yh=-(!OaK zf9~dUhDm0OrtjEwBLAo^m&rI8d5A%M!t*Gn|BX7irv-DjDRO%RnVAU{Y`P@3BGWvA z{l%IC?7wona+ANiO<}&XvO8q5VE{+Urubhp z)jq3AxZ$Uqv+2|2=Le=0HM;5Kobrl@-Tig#`NkuBT-F+IE~U1+9^NYEyFG zU)gf9Zt<_U`&Jyx8=#SQO;Y6F2X@n(%1GYH>sKTm*FOJ$R!t@E=ijUT{p<((^{Jm} z&!o^3bJA0m7Ejn%&!@~_@#N&sy)vc=#~-bG6F)mZRgGU@%5(M_hJ_96yAP%n-1v4h zMS4TWp~LUmw;o#eQ|?32t*O75v>LRg34LJ6c>DCVt-#5$4bC_8t2?!r3qEbP{eJV~ zS_jsKbV2C{3M%tj)ebBRSmir|QSm`Q`M8Q7YlAg%wNrZEl|3LQ)kuv?C9OE4}85I z&wqd|Cu{M(#K~XVf3t~H4(1JB zZ}mO<{j<&2_x?S%s{ZTMx%pI%LQZCrY24`Z3b?EB0rH#Ad| zcelhbYHwqma9Qk)cmgxa4z=g9r>%RI#1+XmD)}s$5`q?EI>{n=$b_Vs1z`9Ot>c&i($b`6UgA z;Lxv+J$%Q9w_Pp!$AR5hKfbt&$Mg5?zgM`a?d4h1JD=aJs{j6>a5^8?_3vx$Zp|+` zchdbvyFtD79OFCplylO5-~9P%Qgz(BW+jFs2jK-duL}%o_uDYsjf`;whP3odM` zF_tK56}^8iETej}llt5>KkvA39-6Y=o4qxgt#$u@XWs3ys}l28wax#R^3sP$0JeF`};}f2Tf6g}?>B#7}dcODL`(M{~7<{N(Enjp0TW|G@h1GK}8$8`E zuJOy~gdXRkSH%mh*6sVtGKr6C{gMl!JhN)HiC^KAIrKi_ik_@UoQTGhFIB(3yo}O! zbY;$8TkyluT{Kp2I*aRGFUPrypIx_FEpqLJ->POO>D;RY$ECAx)Ccq4uUquW|NIq$ z{kz+uw_PoG@YOq>z5L3C?^{i6zMW9IC4ElPPWaWsh7Lphm{ixf6MB~9R~LIqncu6` zU!r<4W_EGer!QYhI9Jcy!Kpv7!=C?aKD#jC zy~PuQZlS`tqS;r)*aa_U-n1~elD}@dl&AWs_#I!bMaOP#+56y&rT58gE^-|yaXUF) zJ-sK?|5!)9{!d}a&Lt0XPQ3iA>VEfTv)8BWBYRao+}g$PfJN=i@|4o)G3|QN5+eWJ z-jurcZJAWr-GIZ><=6iD{pkPv-xa*`|9J4u|MlX3T=#qXj}JE|6rRt{`mw8KW})G= zr$<&4J1mTmaZ|f(<)P8PVzQ0KIKszkosEx#X|DF1iv?Ae=NbtP~3FA&!J`QpOU4vOp?3kqi(&^(s< z`Po^SC1r){Uag3m6u7Zlrl%#r`@`K+ZcFD#v_Gysxkje1jA8b)Ytbv!V&3vZd!DO( zzpIyzYku{0E& z&~?fAOYCp#nRajH1p~J)+>hD9)*ISnm?=TPfkmHahb?B_^C|P(3-sVh6w1rn+AK`~80WN#2cX<^~n`giXxcZ`;S< zR_#!jB&X({-Cova_~_p@gAH%?dFTE(ySlyF@9Kv1VBYq!D+M|4A7$@q6aFps|J)UW z?W^0?*RFhZbN{@*HP=_KuCuF}Q9Hx&@!22GV;EE)-Y;%)5>{L@Uv%2PtjV^!8jR0G zb8{Kj8QybPXkf%}qwD0H3HrzGr11PuI&~t;#VUX4^7jm`yOy1AG+QJ4O@D#F=i`|d zk`=a}tv{j{bzkP{50OYPIv?UmfCGx&QBZ8}+watu}eHw~A|CWKPa;6=+cG zmpFdO%IDgRd8;GVB$!#IXm9*i^KjOAMZepVgHm_TD;2Bd+p$?Wr$TL)%It{pfF1W1 z2uz+JpqqZ=gK&N0A%oUKYYT78;AIw^ak-H5=`CT;XwxN#m6JNfV>Nzd>=!=%u#r2Q=9a!y~vaz|u zC7!YAm27}VgWJMxKrx0<#co5Vx^{L$7Aodrt@1X&pfwg#^$`&Vk!&@ z9ShH0)AQ&vNW3IGL83B^6{IR4xCeo5+@AC>~`e;)8(JzMIs_h+#?^DFNJ z?dM+I2`Rya-)GI4vt;?3$28Ey3 z6;4J@?%`c_KH-z4+oi)tdMf-CHQUa=X;-~zSJ_eb-jQiDkB9%Iw+lA3_0M0Im?bE( z?|q2q&wDea?tPsm<#+CC!Tsu0^M2-DU0+`~&C|vx_UrESu$Uh%^QU+kRDJVWY;O4B zSe^{)bJyb*TdUvi6`!m&$7#KUQ_h}(wfCzt_5UVqktqMYwovS}M9Z903;ZQaAJ3gA zyz1G8ud6#1AD?^3Fz?kN4yLj%GmDSTN_li*!|UQ-OJdgr+BXQ!Sp2^v=I;xoZ4*8| zVYoW^Uu3|tnqAsQ&P;ecc}~bf%az&Fv-w1%W~(XvVR6s9bJ4r{#m3WLreEGRbEBa` z?7@nK(-}mC8srV?n1yhJG# z8P5H1vAMw7BWZhN)@%<&U4t73y7zMUZt01C>3!_en>TB=@LN5$wdeAXy1usVQtiKh z=$mZsjXi}JgW30+d!BiIF7w=TrD|^n#f#H9Re!JUXADWbTw1%zSFJHHy*na&c5#`+)(?w%es6I`c^Wm`#5n$N;Ow^6~l&ikAIc~R46VG;Lc!kI~4Nd#4MYPu3Uv@3%M0v zmK@OU%KpZGw>sfQ+Y^-;l`}ghNT{(LUcht9|A)kE$CsWe>F#b4EX?x{ht{$A9y;D) zIJtj`o`_kuZ;k<1!mP#?R#V|68)TBE|KC*pe@{?esKfzltF4ZmjUD1G2V8{=Zb{@9 zOLt2rr5=T^PjrjmOCTl?fhkZ zy)V(t^F>$oK;Me#MLyR!*PK>pU3om< z#C*Pss=xYvru>muK4<4EyT1uV=_+S9!&H5i>|<_oP^&$6sW?o<~)j! zxbDFFmph}h_w0iin)0isPE}E|f1sD({Ig_o!hJ!_TT1^8;*J?ycviQ_w;|xmF|$dB z>x3DMpDPP5(8`^#+-jEnhCiQ6&&}A!t8t`2DbJ$m`uh0!%=WMCbFZg!$iDq*{WJH` zf=kJjKknw7P`)KTNmp`}k>n@}GCtlmGnLym80Z zv*r&o>i(R(WE5Foa&Kf03nX<^O_u?Yt^dR9LLD*O$vk0 zzguD#7WZ%*3#zqwU&W%Z^zbvs+R5o(bsbt}@>)**#n|g0p~ffhrFzBsx~_Z4TocWn zc`BGc(CSfP;;?wCBa~oU%D$k%QXy*p*+YUM_S>XZOzBU_nRWd0BaMRf=aqi7Uv~J? z{Of$vQPvxO&y~Ns!|21!wVjbG@W-@Sb|QujnoO?GcZPCtnX|Q?_RRUXcXfV}a9k|Y z{`}fh9lKwv{=JpXS>PyPS$H>(YdJ}>E9y70c*5iiGw%NATP z(lTf)ObU1@-JDg*9&q|casS`!8Ac0^q`y0Ur!rDdIU^>DizUv$H)3-r(}IGW4J|yD z1xox0f)RzX2@KO1v{EzX?>lLCy~X74qSg6_+;=X^J0LM_(%y}yRMt1>h@`>^tDm~hdwjcd~qe>FyWzjL`CC2E*IBlwU+)@PkhcJ=@M zY{+`P-M;*t%!K7JpLd12lwQxb%(lE8_UTi1UBL92442rdjazRYn)FLY;|`m~lbhbw z(|(4uzvI-=s0k0qP!otK*7^70_r@Pb{f|Go{C>YB|Ifv$9Dfe>Zv63P^2Q%m^^YHN z$=6)zcwU>ewViV=%ZwcT2OG4-tlx=@z8X%2r)wzk3y@kf8;eqEZhao@?mmC2Diw5z!rJ$M$Y zroEZ}DgB~dEzg(P>#v@FKl_4Jgv)itJpJ>GTUj`KDt`r5PM%wEH=qAcvh&_AVF5Qb z_iMAZzGvV{|M{nTV}#VqqxsY3y*a(Va%*0Q7Hg}z*q@mnW0!uPonyJFoj-V*O<%No z>Y38I_s>6S>CaF6%`iK%sJ1mHDE+Oi*KNjov2)fG-3jgf^Xz9_z>oR`0gFSntjwH0 zxv=Kaf(?zQv{_r1oA@oLxBO z?Ws+NN;m!2=UsPy(bK5-Gg=yVGz^#Yq=4kTJT1Aw3XHY8-^J@`)VK$%Smf*bdtOVU zhQ^u@F0T8bM^%F;u_MLMuTVFX*X<_^`g&%PoA1C#RNA&Sz?CD6Hw?;&S zO~hy!NUMaJ!ukapf-IF62xzDM7Ou5(6x?-m_IByLI!Xt2nb+KJujq8P5Y4yoSNhT& z9CoJOoo(|yrfD@z;FHKS)yj2y^kjUR zG_{otKRheYex+#A^-XC0EoIK-i_Zz}Z+-ls!TkAx>qc9$SGHugI71>oz321Y z)1KrPPSWU0{_Z35>djH+iKiu>*<3EEy3EeXC2Vo+qF>+4-$H@;Y^REk8?Nw+c)%d5 zdgsWh0>P#~v(8-0&EWq%VZZUto%d>eSX-s%*S>kewR}oMS*j0fm)QPuJCgEcoYgKE zhI!Z6EMVhU{Fq_-=kBvV-!bYnT9zHSSj?m<{9n8#D#pHX+0jeF)ffK%ox9Pd+3E2u zPK|xsiOT0UG<+^Sy^FEcPcG2hP`GhRaCw#lMHrn})o#Br;@7LSwifSJ> z(%)VE^V3t7gMAsh>n4aBaDIvOO4GmUxW<0}#EQDUhRbXTVZWz@2Sfx^2#9=|HA%v| zIr>PM;K{eE6K-foH@x`2$7tRJ$7j50UA~Eb&)%NM-&%S${gdCP9=SId?Db zv6=omR{50M%Ln04O5ZS3pJ(%7ZM+{(BchM*AKc}+AE2alKzc|U|d^*$k zA$Qm51`fB~-+G|Kg zx=L@TEipcy$R%hx`9=F1-Vz^$1Kp{ts|=Ssv%7z@Xq(`K)a!GW#y~<=O2TuB0efEd z61M=GQ{9>=Id5k&Nc`<*KO|vW|L@Mjn{39aPu_k!rJ=y;_ix{9h6+!SQ-u!eZcAt{ z+SBoR%7M?H3im7LNqEXhEYmSlSA-}nQ^iLn%qtm`@_5%$a{@y0-`^E24 zFI4!hGk!Mj>q@z4CQKSv1EXV&IhVw$8Rmx8mzJ%~G|zm#;KB@seL9~doG0z?eHfaw z^F$|K@a*iv%&Xmfys=M_Br;3d0S^*V147d?lPmgV}jwv znSNy)$%e+W*T?NmD&b=Y+T|e;u`6Cv!=`g{e{ZQnXR~v-_dG{=dJsmpfqA{JB>q3cFjxMII~d`u;6R97!Lu7%Ui2zIezC^3oqe5l zckbp%Pghto@O+rv5_^>8lDy`E3Hy?LHv4wlt(IpYt55bl z62mk-N0;H9ilCXy$;ESwT3K83o1KImCLQDyxwpT5{`7@~@4Q<|c=hBwDn&oG=KPtbljnQwVFW(IQoCU@*j4pG}L_{VroOp6Nds6=& zA2+MH)7AJ7D5Pp$kK;b&Wx26!j|W??<5$m_h6=Y*BIgKM-M=Uuv!Wt5!2W5V-1V(@ z1zo3HXGv~)^pUZ(r});WF9V&;Bj_jtH&?t8&&z}az1*l=Oa_uYNDr%O{;GAkU@ zTQxbmL?EM^VMl{T^kThN^J}L_921Z_^)O@=cbka9wCAnd;`f+le`04jYy0HmQo@OVvNsJyw9Su&ug*VkRIg15&7)oj% zIFS~fz!Tf2xrBj7G5=_3TeHyX4NvB?e0ZtD)ft)?&}iNs|Jp)M-r<>DY2q55gr`=k z1wKsT4|pzlKIj7jv**s9O^5eL>c0KD@@$X6;#adcnN9>xtJ$c3??jRbGso7~udc3s zd~R(^L#W|*|{1|ZrPe?o~gbdKu#_DvBYdShZojvH;?aj%_ z>W9-RcbRift7U6tSi&jSo#8os1$(nlz=@v+#V&C^wo3YAq&4k^MbP9MPC=k-{%FC3 z3%NSbfH_MYeqXu0)=*&5X6v4sTo_<5Jtv`Q(dWF>m|k zqGOH=Q?ICar4}R}`6KVaw1>g5Ye^tuE6=&3-Qw)dM~st>R2a;w{P^goK?iTn0fV2x zD!(UcOibTncyz|1$G%KjLUUdiV^h%qzHLlIM?yL0fVQ;JE zk{33HliBop0#hX=jxELD!p`M6I^MC$o5{=*^@ZF`>&V z>m+0qZkQgp)PH;h)6s8J7+NEQ?02OW<{s^ds7vG6=<;sz^eUqdudZyFedOm2E{!EO zIy*i2dyJDgR~%X->CO=SXi=fUwa&uxk&o6$y#8`_$Fv^rhsJ3ScifQ9(7Cs-w)%qi zt~S;Kj~Hi7JEPMqSoQqqB$*}oXD*9+AD*_-@Ndhz+dB5$8_#{5wEoZMYj%G(&I#4j z(9u{UBJ$2$BP7v5jgwg{x#U6Aj2SPjlb^@UPKf2!u$pjv%Krb==kE7dG{4HfU)=xx zop+^O@qU}nw_5r6aWhuFOVf2_cOJjSd0We7@jq#uo3ejh zScT)4F4zESm(N{rVbbN@YHs=eqNB?9o7h)R`F(w9!_mc8u0F5H-S>V+ZtktzTbdeM zzBYX-mS|8HW=LmtD0w?0Nk(3Ji{|ks!7D{X!n9ahXE!+Mga=>F^sr`WeSOoS`aP&Q z?zMD5f&7d^#{6otxVXX_4|zfDe7oR6(exR?%xka|v`8VLdvh_?)G6(y=+kZmx#Udm;lxjJ4FxtYbOa!g%>m!y~u5Ke**AyMJwX ze@F62=HcsqWir%C?^mzhwffbW-(h!uwX$#Dl(2P?eBGb>@*Q%$mxD5TmR^wXez@Mo zVyB@dgLy-$!DbPuWKEM}K^dAR)115)8cuUc)@hyQr0o5$KFGs)N#j3_)<1lTTM(); z6Je$k{Qe*GZ@X=b2sgI-1Jj8 zNFsKwOrFx&=jWlWPRv_U@b1peoE!5WzvEf*oKN0v&6^#SpO<;Ol>E%TWJ0}DMvEiI z&n&PFK9`n$xV=4pSMhVcq!|jW{_|`+Z8euT_|7u9cyn|5RN)ey6Uk+7?(dIp=aZcT z^7Ex=F3Et-RU7Or-cI~B%SECkGQsV(e^vb9-cRv+t6bwht-c*!G-rnu=S|*M&GVDz zfB*S8{hRyuFKg>vxFYYIczkxYc}K#G^XI;({+m}7_Vsa-)qF2qSs8rv{tAPCX+29X%=j|dNl9BbYRiQa6P2&- zF3&H0alvtpb)-U`_cR?r=JHJyKR+$4`ub|=t*zOs0~fok3S8XQCu6xtA^rXR{nw}K z$4`;{;%uCLF68Bi$**28M84JSeIiwj%%jzE{`R&!46ruP3(ZgL$$}>#-&CMU2>2`_4A2 z`t@byg3Qayc2#{{)sSo?`trucWX?;@Pg39C+q4?Edn;(6I`a zHrC4Nda*){(kkpP+&iCbn$}Ph{CwfN#`im?DV&wJuM;UfY*@iteTjL~nV+4DHYS)J zU1HEm3?x(5WmA)yW_1D%!Zr+k{QHgQVL~jQ9F+dju}p>`Q+YbhJx!YtBt0LqEk@=Qf^;=jK|QCLCZ8yj%JE+ghu# zHy+ElGfz&MWn1{D<ukTPj zG)wl1{Y8>W1}e`34_sVs*7=zasxt%y*)G?5>bCj5qdHZ{Jn^eqHVFZ=7s=G8#&Ju&?N?c)^(|ng%9X%(i z5&aHC>hw9Px58VNxFJqTW_6QK9SXjwONyN~IneFQYEqJ7fJMs_e~;iK?%zuMAcX zbU(xG@=ilrK-1;Uqa_7rW*Bl^-rd0_YUz$X7G@LTp8wplf6@x&XT3q@up0N0ZLQBKp^KcC8txR&>O5+<^|a zOoR@`Y&THvdm)~5vNCdSPltlj3HiT_+yN6jZrL$S+n~@~#}xS};_j|eEoe zX?tQ($ZYY*^GeSY-HR4MJI`!=9CL;FWsq3AK$sEt^hYz)Kd-fk+*55gcP4Kzp6m1u|%J`0)BAvQv zE=No_G`ZtDnAlFboe*@0I~?93{Zn13hovo(X~~z!B}tml)`I!^bCS2RL~a@7PWDg? zTpr_KFF5!A_h4poL5pV>6#aD4GH+~9>~<1Ld1&rr-`4Rb53t+V~N~S|vE}$9+T&PBYN>+H| z<``I&g!jY!imf6ua$nup*JeG-SU?)u`1y10-p|F$gxnKLY`2N&9XNDPcSom=qqMg7 z!9&L`oeB#PaTUDibVRAO>GqC?BFvQn_l-|joS*smprcS}&%<+f^6To~h0Z$kXol0O zX~8X%!W=__mmg5i&6y;dkaM!!e8#ECnoA<|){AQji3nd4(ORncXLm-j^J|$&`j6xt ztrgw)US@iTeoNadx#eHrtFyj}qCYcZkDe9Ss29Z1@%{2kmp|EDQ!k0!TR+dw{S{|dvzHCC7mDkgRB@^P7iY$3rp|rl?$t2Yy*4GQ%!8*j_+w8g*U)0#Q z`u1D4TD6&Ji@&R!-7xi3r>2T!kxZYbweGL-t|g4JRvtPt@3$1>#psFqE)3%Dy5scE zbI0N*J8Nb*?c?cPJJadky8izDjP17_Cl^R{8b4hS66f>qYZb4M>E%qFi4y(Cl~!(u zS{qU2{6=W|k$ka&x`N5;HAA#ypQighOfcy1S}OGXv!#U5+_PzcYr~o^I=TtH{#xau zHd*1P*3{{}Y9@Qt*Ckrb?OMWkRc6PsBIQX(GQ~dJ%rgn}3jT3JAanio?x?k55(k1- zimVOO_Bayb^XqTjhdVWP{7XM2aC!FKemgBicaqr*=d|dK)Fe~xA35i^eHRAJI&@q- z%&5sohOhZ+ORt;qq_e6jNqRb7PY;UR%iDhA{r6UL?N3I*C(d*)3()j^_`A&H=G(G^ zk202iO5>`WH#hb4(@h`RTrZ{XjoZAiGeRxSSW(HO)hiPeu>VYgPE=RieOS_d8^MH5h(5hMeY?5t*`UfYWm!B-X!KJ{7C0uubNjTSA0H~csJ|GkSBK!elfgy z+OOi&iG)7}ZJvizZ+`3uOxel2@xOoYkDotJe*6)+ghSx{k-z!AimIh6wnzMUJ>kUU z3A2q1Ti3)MocM|TgT|+K8$Qpi@cW^;ZSwuiE9Or;TJ70)$$QGehclF1n|7%Gt54>d z%p2LdpRLozanj}w=`(voJ{?qYJzDJi#O|5U#GHz{B>^rjE-v@vd>3|fbaZ5Jxq`UC z8cIq^O0%2<1qB5!igbZwmVwoow1OlSX^Mbkd>3|{5U+lIHR-5O>&5#IH*+j%S~SD> zS;L~FbBwhHii=G za-Uzha^1bq$A^pFuev6Y4C*VjE2KH~G{jN-&67ry`e{CrpW`?#CucfYxQHYlUV@Ys^M?fmku4m2{~+L}Fm z!HN|c>p2SF-`>uDu-i62<;9JS$#>T&64zAjulX6Y+<*SHdA8MGzP*iJ`t?zH-Jc(Y{{o>}d5X3a zK6cw%_0{WV-QMc&e$r++3sht*-<#*(%lQ56?XJqt%P!UZRX@6B_Rf@tclAu`na9-q=XKoBi`}KNX>DcI#=L1xpb!j-=y;*nrh2ILN6D)zp2}`L7mjoa zU)^6{zczBS+y2;@-xYi#-%eOvzk|IZ?(3_on#G^?F8T4pvba;VHRbq(L&y8&+Y6N+ zMs3ZSdTVR;a!z5jj5jwnO4(Fwu-Ialeols0#=^k(-MR}QZq(mc6KQ;QhN1J6jGyNY@~ONz+|Iv9r25qrP1~w39(S5EiaJ`)+?uK#Uh?=D z??;(i`)hwMvo3$vQQP2gb-Dk1m)}=chnGG(Be}QkZ5>iV@MKjVq$LdJT`w*dn~-!{6WEQ??g1%?Yr|y}Qd)a^0GL9b9j} zD9_%Jbd*ccvV$kdBdqYwjzTHpw4QhO_pkSws>M0cX@!8WQKIi`Gtr_WnJ=d4Mt7Z2 zatc`=XUli!!ull=6K5|8@>phE6f>dagVMgpzk)|1H>YtXs=YqWIL)f`RY$r(xl3R6 z?QOZMVs>ttp*>0F*7m%+tF%H_b(C$|&|!F<HI$?m@MY$CVk-3|Kt>uYFC%o*d# zZ}%HE{;-B*7oAqtKaolHDg|$EZFRaJAg`i($6xIIo12@ZOtYr6@klP>64lChc&OFM z>_n4p?5>a#kG{OTd^FC*rQdFkvOwV?5$}^*V|ErPd7C91U`Xi_(pvB3xXt2%pr~@P z;dGUtjttj6ZjR?05)WV5U7r8$Z|dKU`8y{Hy0*-WKRe6R_2={(({-cOt~D7|_DY!^ zsb-Wm%USXC^mOi*i&Olp*I!ngSNHcPSes>AhPzx5zljRcz9G)guy5)K-eP^>Keu502VbQ~CDp z?(l^zXZ~|Ian9nozreBihz-A-&5Ee4S)HW|U3}U^BA>Wk6x9y9^7Qod);~dg%W9vW zo4ZB%*pYKLQse|3TP6z`*9sONFF24)QhU#(>i*@W^M^v8^t-%v1`I1*KRS+nKP|QR|&Wu zQ>+f#niaY=<04a_%ee_AEE6uDo%7`B1+JUMUK>;OS{>|DdJn55-k0B~eA+nuoQNU2 zW{R#wigVb6O%{@N-=xmXx1Vou)A~oXwV|P1wNaz+*)OTQ5$e|_+4jD9yQJlev4CgG zEW?WH2|s+orr%!)&aZ}@O9Tu%uFmgKRPWTxo%HaL0_&&dj)@B&C2+L+{FrR!wfK#q z%Zd{zAB~Sa{JpdIc?G*-@`dRU8qSxGdB!i9bVhvURtxHOkN>vV^zYorK54%42F0{%-RIYcKK-CD-R86ZTMt>G6H%Y|j&69iMp>z&V3KOe z*+}hQ4D%zOpEkT!_45u{S ziQK=Hy$%1b+39*lGrc;(`oz|-E&pFiZb`50)BI&un**w93#SI7OhPrbS2b z=9aUw&5w(Ed}Et*af!=miOiP!mXh9a>?vR?gLouWPxb!!e|(R1e^Hj*AsLIQ-kQ@a zk4{YV+ImOW>)w!okc!f;@fzQuD(rKv%SzU%QYGKldUdR=wA&_?O$oW<9q tiqAc5XJm*tu70fI=)U`pciw%(z2T+1_^K)T&I}9;44$rjF6*2Ung9h+l;{8e literal 20287 zcmeAS@N?(olHy`uVBq!ia0y~yV4A|fz$nPU%)r3#spa?&1_ow^0G|-ozyJUL{r~?T z82yKWfB*me{rB(Bzkfge{r&v!@0)*rKm7gk>+hdGfBydc^Y`DcfB$~{`Tyh3zwdwk z{rvOy*Y7{SfB*XR``6E3KY#xG`QzsgF!=uM`}eQkzJLAt?aSA%U%q_(^5x6t&!0bi z{`B$l=Z~L0efanhj6Qt)`2O?9ci%p~`T6C|->>ifeSh=&$GdMo-hKM^_T!hgA3nT$ z|Ka_+_aENAhp^s$c=zi4ySMM&y#<3eZ{ECl{pQW<*Kc0Ge)a0rtCufdzIgfa*{fGi zU%!3$`s35LpPzsD_WaY&*I$2q`2O$9&wrnO|9kiM-@70G-+lY{=F7hqpZ`7m@bB^O ze-FO@z4zhIoi~4Oy!mC>mrpFMm2{MoaYFQ2}C zarf(-6yH?Cj3eEIU#OBXMmzi{E~xeKSyTs(Q^!pYO;PMtn|?!@tv z$BrF4er*4VQ=8A7*>L>&(!)3A9=S91(7j0~pSK@7(oKoLKwp?5c+s=iNO$^YP)ySNBf5vAN^wx`s2W8V)UO+qk58{j~ZWQ%bi@ z%sbefvZ^(6No~^1vb5f+w3htz>b#1)!qU{-#+3Zth@8o8X_JDZJCdVXVj{}}!V2ty z%FW$#4Q%6F9E1IW!=r=!WO(n5v%Mc` zwA$aW)WaadSu4uK$jj8!!P?5)#9B|^R7qKFqet*p1_lPs0*}aI1_r((Aj~*bn@^g7 z!TYJFi(^Q|t+#VIV}ir)eLtRQr?Dd>I&Dqx>g279ABS*nO`h9+-0oW8Vb&|xb}i`O z>e#d+lxc_J#!a`QG_CjX-}Jh1NGs2!Wdpkqhl+z)5|av}(1AUlwOA_te^*n`*tT^o z)5m{2AMX^O->Z0Xdht8k=jH#N^Y6$s7EeB8l4epZ^^X6tSi*efWgC~Y8vp;m_f0cF zDtgvu_BX}{Os=&!c5*fg39IpV`AAHeVUQS*^eeX1M!j~*l*f&ZotZAF?dSiWUXf8( zVa2ApOmOPHgoB4JUTm7UFlJxY(NE%4?Eho_YJM}7lAKa3rugf4y0(3^Nz=cNH$S=R zdltJlY_c$)9x4BKazK^q8i{!i)r+MK`L!d!ZgPL-A1BNAn=jwF7s2GPlX3pd3)8*q zzTOlNWI1=DUNva@`MUhG^ zMoj-$w(tkuNUr0jj{Rb3TIMBq_T-fNnF}KIzv-NrF2wqDmPOFWU zPWWt-3F|vn+10!<*IKcEe>}r~{W`Hz-<%mzYfbjqd1uA05^#Ggtud3SaM~ol^Y@=b z>aGqK64cP&y6n=+NE43}n=+(tu2O4L3w1SqvO6(;rJ%!3s}0-yulfh3d&Dp?pML79 zHPgV<`_LqDMawnsmg#I=v3lat^ZUcs3(E8TS)25YbK?JNHr%OezkDc^+YmATu2}5t z6aG5ao=oc6ZIq&SJY4_y^~qgVIi~ndmpdwNf6~z5Wt{eubk*J2nM;dI zE_bo$^%Elp1C5TWA{SkMe~a#GxylmYrJVJosN$LVCXt^WcHM_EdO3fcO=?p*pY6Wm z_cKkAD|0l?&souR?b+WtUanK-v0W_w^MW{Yjl7qNxF58g5EgW0)dV9CmRshTd+b_& z%-)jCFRFBjtG15eT8%X0l-FIs&Q0A5CN61ZVRx2#r#@>_hU?0QC2{-LX-=y9ztGQ* z`{C*LPIYCg`^5fKzr6DPLgl%IxkvUnDYtwIdGYzk#5msC&R@0*zVIJeb@V#-sSQoq z`ogD#Zx|>qd+s3lNYFy-6UVUyM@%-&c)4@&k`gsge)$@ia6v<}K$J~&nV~i`i~UW~ zXx?XP)hhA%HDD5% zb2nP{t*_?peOG(8QtVWDn$&CqjpMdc>MM`m_`-6kRnGs**Lbz0fIe}J=V#2!Y#TRi zsOw-d&^XRJ<=N=$jocIxNnbEYd&`9AY}dgijtA^7T>qVwIcez)U5R$7sNl3T$&h$?6W+fZYCjvjuNFS~^ZkFvVc(X{ zqO%u;C*;H*w5u>%t?VoRsc`OFiHaq7eYt+Em4QFz z%+XkFAijFhoZr%GB`hbFa!snwJ9p9bv5)hDHUH;Zu6U-$wVHokR~^d_zehULuB>h2 zs;D#-xX)#4^YG;JU_J3${6BZ-ZIP|mWZ3F`x9jSZ^=zk}b~B#pT9z;8$@ODW)eLiQ z-D^usU5Zm*{)}Rssq9@Yk-s?9dEuPp_4m2=>B=-rQoYyu`Q?t!J6f0cKQ3sAw&vJw zlmDi*YtytjlDSb+Zcj*ZKXFdLifPJCzO)?PRQ_;ZWt%)jao74Y*EqhGS^EnoAySyA@Y-vw3eS|2{{pqo0|o`JO(WHLb&{C{n*u`{%N^1?e);LXYyi zHFA0%s_!mdx%6$|g!{g0bMAFJ{=BpxX78!(XA7@t)r8N9pRF7x9qsu-;NfplrLU6b<*4)RT?&HQst)yMAdA6I@3mfy5#1NR^qt(_k*S_nFwLNE|G^PIMw2$-t%?c9E4!gKy z|FSQyI~X;*Q>(R?a!j$Sx!C*W`1Nd+`3x&R{e7CWW!V$8n-9EZ|FQlWuqmZ_;-8HS zOT(8%)ud!FI{o9=o+z4SDp>yRnwiJ6j4L4`E+wDmB>XpSJ$wY2;Grp|iG>udA)EVq`ueVOom>%7G4Odm>@Tt0YxU%9<(+1aNR zFGBxkhhJYSn=V!LJ@yCls+ec1g3GzT)?XIrUvjiiYIXZ6|I@O2x9;`&__VLqVtrM+ zxsR4`R#fSwzf13Oxt?L&@w?1s`Bl$9yG7Rat$D}7cT<|_mdvgTg$#0wd6sUUCKM5| z;o%pt)5*tk&iKjS{;=Gu^J`FT)nyi$NuR~eEpe*)5v0A*x#wowT>DyrJ6$yl`K;zc@Vr~g=cZazjPDUwJzTBZ)CHt$N4)(DmC5z zu*hk~`OwuTTB@eL*|1H&b$M7|;x@Y&^WTnr%<~+Uaf^&HZ*P#UF9EI)arEC_u`7sOIj08%v>%cdSK(ZTXqY#cr2bGdhi@eag603 z_p2*3Wm2<^yd9gwmkLRRtlVR_aj$1)e-Q6~8SN`;pInmLseG<|d64@-Pl;d2@e-$m z4=?mNUv4g^@jP@}&PsUGv>m7RdG-KwB&Af)SE?9o>iGSU)W?qZlh<=#x+`n(V44D{?FuF=n=wtyeN3xg7nF$lkA>de5fj*anXqH zIg8(Ot2wKTCy1|YTgbvZ<=oYRTVK9OOcQC{q*J+Ea?TPx=lVC?&XQ6|IlF#VMO>fu z$<^|U*2{Cox1P-Tv+7EY=*A_s^1hdiU+z9*;c<>9rqfE@`&q%dsax2eU!O2-Y3I|9 zO`(#PlpglpVL$gZC3^m@Ek3SOZI<^f@;oi%{8{$qglUucj!*KswRwq7c|$%p3iS9otcUYU8hXjAJ6?!Q(V%*;K$ z>p7=b!*k?mwb46~9eSxQ%9&2*WF@A3aw=MIO8;cYk%t9Gzps5*XBF+d z^=sRo2Oa(0Mejs<gYk;;<~|zVT^J%^tP4*96zU-+!M)Qm^MW>$>-b@7!x+N{nAk z<|vl05N$B3kGzpKhyU@liA!ySJ~|L!ndUwLrd(So32r**b@s~)Nx z{FPjPw4-k$r}0m|$(rF4_e9U16Y(cvUw(_y(kZz+ic5aax8V&sw!nC<&~Nj&PX@|t zs?UU^ij(h4OmSmhdOmiy;N|mIcRv3*ng6Xpec72~`75$dsb7D$l7;Q*dFRYurZEu@ zb^3GNx9eO#@OSIYlab4F*z_+kF`4l$Nw3W{{t|H7^!>a$R&PSglDWK`AHVj#y!mU& zmS;&^_a+>3zEE`OXxOLQaj`ESEzh@`aC_oPRjDf{(zo#~^#53cep-7@g|j|Kz91_H#QL^~1EoyWgrCmoJpnTYF^Txl@M&(84{Wm|qy#8u#TTXSDu)S=1K;4Adji=)48`t$T zGrrrW7@#zhP2+5qaM{eOmw1|QZ8e&8)XjH7;j4gI#w!b1s!VJhz>>SCyCdukV8* zi_3zV8|;JC-(=o7Ah^xUa+=+aJB1AQmoBcdyJEWOcXUT-U%`|+3%7(WRX!&ns&RVq zw&;+_)101vTi1Odm3QI6(pr!8KY}vS7c$!3pEq&KW~Zh%MGjG)yZI;l`&^Y7$iFp; ze`#c^-*uk5k1tH$$Njd`$1SmD&Fkx`@lNy2ox?3aXs&dL#mf#~<4?buw+_GvZ*P=CDT$|tT5R$Mo z?`N38Q@wi8m*3asln6Zx3@#CTgT_rk-na zsUlUY;jwXnNG{_O?K#@2yWLn%1%1quIJfOm|EveB?Ufl)lCCZb?z~rDE%bh!&n}I< zIyd?qIQM_-`OJIslCWhvZ@?je)W~49Dd#7>)oqp8Uv^wFe)oBasNi2$jz6rq{e7xg z>LmMz>01`x^?Z6McB+zKL!9cp(9Ua9K5*NtSd`;#xONJMj6T!+g~kYnXk&dF?Qdkz)#C#ol3pF#%>J?X>r)uxZWpp<&@@t zGR>(Wd%{-QJh{9y&uQTi(d;Q&MVwX~^Hv5QieGTvdFd+2#!q(fE1RDEj_vc(?3ZI( znz=K`wQ;G`Bkzz6M$8e?!Utb|^jPV%u;+?aD06_9e&&=1A6^8lnsl=u?8ef4k?SW3 zpViGy_#E!^^Zcn}*>}|Z?cNsa@$T7s)QRQP4Yp6qyVw5M`*&l_D)srNM0YFx>=REE zH+}K>BjZzNmQy{8c$lZu_1Cwg=M_cBZuAj6>$|JLN^NQQo#&5yPCfNIx^|=Ztw+zC zR3Fta-50$)HQ>&>kjo-r?oP1>YN95TE?wgBaEa=}hZ>x7mXv&1FlWb;*TLJu)WgsG zxz4h=-Zx^`yUUlC+s*&K{%5h;x%r=ug{&5Sox9*bo8%7F*LMFeUumsxk}M8WHG2M4 zTkV0`x%vCQv0R$I;mMI%=O=zDwzt}trhF&cKejk&ukM5&`cL-V{;=oU5w+9n{qsz> zT7CT)b9%jh&J2duP=6 zudki1^7C#mq(}eyy6bBGe=CiL>%G>#>wT!sSd;TJa2rSKroL}4AAMSOI<`u~QYc)^ zfpha2KHYUwUpD<5hH z?wTy&73#*e*&}$W>Fen=Hfd|FrTkw0Zqvb&W^VgVT+ee!zq;}Kg4@UE`*WAXAFO*I z^I_-I*RgL#@+Y+ zq&_~9Z7+Z6${a_vT7Su_JMY=EK6U@+_|D8*G2@50f9XR0E$_o-PtTiU@Z(&LuiyIH z7Kt{FnJ<1l3|@GjUCmI+`T5T+KTr31aHrYvE>(438#YP1>LAmpE@t`%8QreEqdSC z6uAcZ?wP;CW7>INo!pebh(~Nf&c{5SawK1VYp4-#JEi-YWO&2j^J2EFsggbk_Sz?0 zj)#T?9`h61=Xzh?EebCF|I3B@&ga;F zR_nID%G6MwTJqJ*a?1Au9Dl5J=ITk_Ul82A{t(lNl3jmQw)tsp)eq}jar@NdvZyOB zM4qe_e`)Q#q9rVLvh?gv@mDualTl)Oy1M<-`uF@9|JpQ!P9ELxaO&i;(_e3zJpAWY z@lQqPRsM@*>W^Ric5c!Cus_>8<@W52|Nkax^`$IX?y7Gz=hWoHbPcltvG=dGm@I#^ zqV@g%mafHhNzaV~lU4{^D$jteEg+e~Ft@c`mc@E@!glJ}(#) z)_k;Pw`O^47LR&;)V-@74_Q^4{+{pOWhpdenrmg5#FWQer&`-8rY>J}!tf%)(z?|? zZ#SG+ZyTgt=y>VegtAZN|J(QPPQTD~Iq~5;n_Hdl&2*x^@Yk)n@k{<-qy3IQm+dv) zykfi7tb9=Vzo6K=Px(I-Z5HifkB)9_tKWXn_{%NRaE-XnkAI$fT`=|e`+YK&Q}d($ zDQiuV&v`2^Qzz=jp`6&gCM!ewPyLQxmPNN76ioMD`{1OOiOC<0BB%fI`)(gtYG?oI z*(=xe7d!d{ojdm(6xCA+@-Z=-^<+`~;WsI-j|#N0H~I1{>9o0(DaZTDN#beWvx^l% z8ZXtmGYV|(tA?9fe-^p${CE{Z^FN)bv!28+&s+5>^VIvER$bMJSCwD;-Pm!%Te^Cm z_mv560-db`os&=MZC(1^q%l)UY0II9T#ver?z{VF%VE(sD z$ouZ6nB3>MtX`opW#U{Hy(1f#HB{wlDs=DX zy^8%l%cX3;ll$vMLUKnRM|b|Qb3HxxU4*@c%=_g^>tiByZv5Y~VD|iVm46q^Iivhv zFn!m9oa+Z4CLiQp)*r3mzb0mD*4Q^eaJ`36fEr}$s$RR7Vb z6B#)BvX*~b{9h%xuGv+qci- zVZHogQ_D?9^3HSb`g!x#b&*rXl^-IP3;T9U{+zxkPsVa`@$Z6r>xy4y{{DFNn5yQHur&6XLIJZmU1x}1A+g!er6uAQ$+TZLrS z_e-r7;rp{}g>dUk&waL6ymQ-sPRY`;PPMuFl-FS=S8rJ5CENKCxU(YYG z<695z3~bJVH1v|L@#Bml*z6Qtx$>vO-FFV50cfvMK8RCC2wfzZu2aN^W2L zNAmlObw|tB8}(O+-P0>@?@QXXJ~sN^i@1v4Wml@6ga~Fle6;(Vz}Lwyg~STAbdvr? zS$r!Ci8#`^=yt)H)0tlw(|3q-EqCQ|H^_6Z%1WLuT~d5DnKchWP@Na^eecDgE zaX53l#Rb)URfxM^*JV!mmetS8bE(QcAAWeDN#%L}f**SpDBSsaex7~JcG(3>T6XJj&qx%k*b`Fa zId{LH`PI)A0Rs+jtD^Pq1kW!;H?3Zl z6hw6NhX459!F<5>%(*l6cT!h}|G0X2VS(2B4F%WD_dd|^P;>EX@MZBjzv2Be+1al% zZC@|>`I_@-$>K}l@wRtsoS&Ajb6%18XPMs$#aYoGo;XRLxS(u)xFgZNPaL%d)!5XKVf&)2A zd^g$0-zl2w23Ct)({@v>95KC=eayjr?t?t1kp`Mj59Zf`%fwXC0G>9LP{Hmr)j zczMU=Chw?I%cU2%Jc_jqIc5B``r?UDg9m!zp^E2?)MxBae)a0=*L07vP=_T8jc=)K zKcAQ?oN`rY#+POtJEwmvNs*dWQQwpvswd9dC~UNr$ung^fD^|;&8>TvhpMEQEgVh zW?Zqv+Fxkb%IJqGC!U%8eWX0?s^q5H&FTIJVy9U8d=lOnGWiQ9$EvV}?VENvZeriL zsU;w%i+SlMpTCQ&r|52;zAOAoips%9YNsOX6`54UjsAZ*wv#XAGJ~r3l!#dQ?^SWZ z?`nT{hP6C@$|iLw?q*5X-OZU!|M)8E%ymwQ-Q9AkRJQ2P?H^2k?k-ekdH(al-TdE6 zUGrt{M4Va>T*h~|TCM#3=Jq`c=JBT{ws*+&n%pl5tZ>hAHg>37)>9A;RaRxKBIO-;l7&)YFy;VS3r*%K%2oKTt4#L90r@oRvUi|qB< z==Ib2WBDI!ZMsww@UHSq{%5AInfd!v*4w>&FY~CZ__J!pFK?6kmsyR@D7ri-E1A4h zIlsP$>GLM`b>ZbaIddM${<1iecOvey@vS4u(ep*bo`%ax?2=~McxdH*`LYw;S?7%d z{5Ws***z1Qab~gcvPTosnT#J<_b2N;t5_y`=Y_)|r6V%!Z;Ci)t*-yJ<(pmBM`q(g zpI`9gYsfR6JX@gkSMAGfgY{AVtwyarDJv%~O|;=Cc@bM8;_IVou%3n zye)oxbHF~KO8bx((YI8YJLiXTR^H~`dnB7JBVpt``ZMA-L zij(QaHSSBiZdkToz5L?LRPz&avqYxEZfjv%sO-IIxyzZRy}eAKhg$O{F1xt)vz4Or z+%LY{Ih@w_OKZ57yDSe`=;3fo==>F4IO)2?G>@tykS*@B5R%GQr^ zau3eB_xwtwEaxn*yG%ce*r%1ue>?Ns>$tUr@(vG|$QFDt>@)Iua70nDdiJ-?35Fjn zR<|3@z5dr^ukVC!xz+}43v?8Dd;ZVK4v_oR+4TH!T_W#`$&Y{i?x~%w&FAw>z2Wm8 z&CixO(=^!Dd)=@3+|PV6FrxJ@>%uJ?H{LAy>c(emGi9c@&^+mk=B@>WTQnKBTb3SA z*wyyU(taVwGH00$k;g8Z-nx0?!NSWf*Nb*&{}W!}E^J=NzF^D7L~p%vhADPc8Y^A- zzfHBhk^Y!@^RZik8aqua-mbh`yd_2DT#@9i?IJ5v_wGuv>MVVd#F0_^!RfZ+Z1HR7 zoqoQVarUP4y8Q_+SavhQSGJ=tMS{CVkb%G>XXf6Z?D#}^Q# zaLx4ow>NU0F5;bjb6y0y_S;RaJ^YZ@cA4wV?SA1GJ*_!dZ+pM^GB-`<*W6e8R9+kM zFE!n~KtaF1^7$>(XLl9;PXB%Xs#D{vT`QwJWjylJPPVRPSZW(T?bV6JVcm0cyOx%j zo!;_f-7>b9bs76oH)ec3J8ikpO|ONICWPIu;dU`hZ4S_T?8W-%uf`Oei4N~N@_ldF za-?ow;rNJ6uVkm&uicI>&)#?&`e3GOxthz&->#1PxBI<0v+((0S(D4VPTX8&u>V!w zztjl3oiqA$wi&fL?w=Sx^*!rT`)3zU7Ra!i*r0J{k#J;Z3s2RS@accfEmrdqoV#gW zWU0FTYcb|dGnS+8tM8p#Vl9?_IbYOUxo^(tCGLeUGRs8wW^P~8eeqDqBPYJ1)qVY+ z_H8$Q6XlqyA3M!a{ZNwY(~@0>^BXTMw|mALk*>CXc8%nj=el`wMBHwf+fM1tUtqda zdi~4lbuEnV>OVf^3-YaL?Wo+krhP~18E4L0n>H%^^?NsW&uuo1+<)pen}0T(EnN0E z;aB}3Zl%6?1vd+4MJC7>l+?Do{`Oce{?-ka_?If;GCy0?&-MR$wdM4&_htIYVlt8E zd-m+Qz5hYRio5p@bImEAQ|2gV_Sxxe&YFbx(;5~RD9mB^TemlF@qO;&aorjl<_l*% zKiK1P{`1{;_nA*s9q&r13);yQ(=k(>Us^-QTYSXQ*I`B3J0pD#SmJ^m!>Y*cK$=yxe-mr%D=&@Po4 z3GOJVFpU$T0y}-bPTIp4QT51f{-F|8gUXMoXLl;qK2+)JQ9LdF=IGQV8?N|8hI($` zK6$7A&dFloI^ij$OY9$=%j8@9_0i3B61nr&t>nmDaNh1!=#d828_WAF_D(t_H2vH6 zR~ZxJ*w20!XR9q&*8lM8uCyZa?f5@)7kA5h)ElV$-Ll7Oef>w)7WE&my2Yont7l#p z-@klb%|T>^J}781?DIGqoHe{Z?nkT?UHF7sW4M@YX~}va!$SUZ!v7 zgDrQ8U*7bnjCRHkymPD&>Gwn`IQBwOn9Rx`niJ&Q9>wV3ck zy{ei#!AvT00gLXL2I0KJx(}D8E)CL}#M8aR;(?CE29;Ci?lUaSY%O{IB6J=Aprz5}?<9@4C5uvf86qWKF|3PW z(w-VKB~~oN_QvY?-7PNYRJ?f9^^5ojNbC znZ`lnM9{Zjy-D`4aah$3{=CSZ6 zB`=p$PprPs{Iu<9afI!bU2z?GsZ8-RqxQ+`#@|{zIpq6`6Wewa7udTet9~x&N@Ew( z`Q`Fu-Q}$=Tx<*H9C>w3)2J%J*FA2&UlfbB1*7Ve<5sDcHnpEx=3!B+awtBuU$4@- zVE&eQ{#x$kFSEVY`u&`pbt-;E*OA;EhU*>epN6|Fxm&i)-?=jIOZ4LC-keP}zm`eQ zdJ~_%phk7>bGxgvZb&|6J#}+ib&r?Xd5iNO1-I@0IC+!AO|E|-$Aj)|i_bKzR}Jvv z+`FsxPS1-y=U&(P*A)MfZa!%~?<_gLtOQ+SWUBJS9^unw&pFFcy z$6tQ;^4SfRX2 zJ62saZMA==TwEHo{fu7V-cJ{#8B%AidwO7}73*4;s+|V~+mm0581}HuJ+Y7Ht@WN8 zclB3ZJNf-*ndS){o>PHMMa$gt8YVhMD&0wM{8Ev=)l$rn-*073{MsGL+xkxV-Aap` zd$(%Eo{efBOKPVDH5@VfuD2%hiTYoD{k2~&xRxkJCuLUK`7c>$@FY@V%3`LcM~6p#?Im8tVIAPCUNn&=-RTNBq-1O`2Bdk>>HV^Es9J zv(lVLygYbE$nEDn?K3xee!j6}?S3Awrh@-MayNr#yQ!2M`EVk2)8DO+95psa^M{!f zP42szesGch?1W8c?{SHodh?B0)c4n{pl$W%B6I)9%vkey_AcS(Pgk9OK6~|HPQJ6# zXP$s*T?rLym4mcP#bekE=&f96j1bSBGcof&78-&eF9)F{X-f1G#O>uK}e zxK`HaWi5uWJY^0ugcH8Ac+HU9aMD`m(BE79KHrsYI3~DNW-ev@&|N7mw!@E;J6Z1U z%WN;d)kgmp2F2W1>G5k5%d@lFyzb`hGF)^(p7SBISJZ6TbDu;_Y;q%cCB-fVb_7YB zV9nU+#4=fI;Q<}L)lF}1FPtDYsph4`l=Wh#G8HSUp6_Hl#r4BaEnBmHRx)9*h zmCqHM&+B*>GA8|2Y3tTnLAy$BE=fpYjvJK`uQ z(BX3R0u^Upt=FE6@2kR@ALhY=W=VL z%N;*l(V8^*L7eVIu|+Y8tR+^r)-~o`>t1wl(u;eB+)s}@J#(j^U|#%AGltaEPktHo zk1wR{N>b=`s$5wsFK~JC57j*@Pqpm7t~Tdo&wSRjPfv7nnoo-7CGS00S+~QOZ_aa@ zPu3IkH|w*fGq2&PTlaW@1YGbjKIY4gHllbRK zf9o$?%YJ%s>4pVI7z;u!ZhLgD?AR>j*=!mYpIL9Z+v%+7%I_|p>YH~fLgWK>&= zy6cuNu0F0crF&hg@yyCIx9>N7zQeGT)m=Aa^8HlpPUe@9PrVYg9WvPyJ!G<1#9W-n zse0+|4$Y__af_pO7i^vCy7;X5>R6AI#?OBkPK;WP!l#3tOh5Ul($mA!s6A@Y$^Atut?M4o zXcc<7aL#ET=Q+rG7`Ea#8ZC z&wsWyT-p+Iwdlu1$NA@)HKqtp$o4wYH_xQNm(!9Vb!m#Z_E+f$cP6oyshw|*F;01Z zrunBN7W* z0zBiQ=HB_}BptNr;%xrczm%$vn@n-LdbPE6dfTZcUA-HhbG~i9C(Pr;b1IxwHP7hr zGvj5|-hSdYK{aX7mIX4N!M6MVGPOH)I$BO!Aj2Oo$EFH}PrIEg3-87E@SOT2H}}th z4TbkLdsZagR(rm?MAvWf&no`8*B7fvJY8|&Wz}pMHgiJ_cfnKTOugqS`&uFd-+xJZ za&xBW{oU{DuikmSYXASMhZcMEl|QtdF1h1#|E#+|{{HO$<+}}b5UefY4im*ro{=#9)T^EY)?-&6+JqocuqvUUC1W1?>MKHMA$4zq0h|sU1&_|J6Ka>~pirU1Q2J)4v}L^j6)sSu9$9A?xXOg^2x1Zxy%Bnx~kybi=K= zo0M2Hzh+7m9yH@QHJ$nCk(rH^51Y>wzu)yF`|8ODHs4^tK#rQ(7JL`tU_&jH)VBx&y4WDh^c;#KuIV9?K zFs;ETr#&-p-Dma>&M*9mI5%(BIMw^-((K3?>Fpu*A1Az&3ahx$K9M`^t9Fk^y@i*2 zRM|`Z*&hSs&Y#e(>XCUNKP`O2%_$S4Ki&=NU@wuCRR6s!TF!Q*%Uv^$r;Kwt{|hz< z&AJ{dezZ*a`jj7i67e_fR4T5jb4*!!B1zSHqD-)V&GHiQbMFfuZ@X2e#Fe_y?dpAf z&8}J8qN?Y#`x|rA@;|%&nIn0kCgw?!14|)Gp?Bq_f{tL;kKYv+1$?;3DKSN#@lRIQL2(tejWJGUvI;Yscr6!EHi^W-M=XmD#v%qwC9y@4X=08*6JoR}id|96VwDyqrtj{** zd4g@@!+(y?cUC@K@OjVU1ClDAf9?F%oVNAjoh7LWyl!t?FVwW>=vMl;p7OqP(P-nH zCH`3})-0L()M(4RHh%d9Jt8hw;;Vv!kG17EEMR%ROE0r1_Krt@-dzhureqyXzQWd- zj$d8QPhjW|{a;+fmX}%3u{*Rtz-Z&yDGT2A|GPbD!35tAPklexSlzz-^>Kp1IbF^> zJvsk4+ePl>ZRJ!G(b+n0!K;wU#b4~K6m)7;zZF?pCNXV48@Zi)JNnZn$c1Jvlohq>H z{2H^w+bMBMB9B+C6mK)TpQbS-<4)AU#`&+8n`jrw&6L|;WqPuvXM2u4tLj5HH?7Tf zS0DORZBt__-{f;7exYsv) zt=aMU&ZMKXnp?Cqs?qBF?W+%Lo_EYqpW8k~w?~HoZVRrxN z+AJaOg>26&gX_{`Rz}&rurXiTd)?Wxb!~|9zt4^uyPsxxIq#cxMe=mucI%H%f3j(C zp4jo+pA>t1zk%&P*1WFz3&%Xe+K#ix z$Ot{DJ991j@JHQwj*QRlHA?sAJC^%?<$2^aL0j#;H~&iM2T#Nm7ISQdG92Df6H6r>KXr!H1(O>w>{;;QB(UsDP~soVnwB0PMV31 zRcFlauV8xLCeJVN%qD$hr}EPIFH>q5pIiQB^IZhPK(%?4G*o_4`9T`LB%hGJ{h2Mc?fUE@PbX_P0-V z$u5f-{}~v!%IvhJ4e`YN->C@+L{Ul-hr*np}p@yM`yZkAerBwl1PiuHi zePnuSy7=;0M~&j@c8~23N?VIoJ$G|HKlkNJ^}OQE>-%#hR|lM%la{l~mgUqw^;f25 z8oFG?MT_Qd-#3}_;k|c_TdqGore7Gh)6(*1LYi~&9!d9miC<649@m=k{)~wkZ~LbG z|1~wvUtP^U_j#Jk)(jQx!%tp0*8d0=D>=0Gbmn257m<96S(duydjI;o&}8*XdkdaZ zpZ-1jwNIK&!~6F^iK~x({kh)6?>5)yNv+?r3Gu2^Hvdn`kzz}&|IaX$O=IuYEeEnr z8u2CRe1E9QdPwNq`8vNB42$DLxjtRc-}j~Q?yiMmC6|NE7PBn$)%oQa?yWYeCV32Q2cw+ zG-PLO1V$UpQi#->q={$dO zBfExfSDw<2Ss(Me%>5JFp1bV#{-J0tzj1+a`Aoy2MRqOoC%sF#(ll@K{==&czOVbc zdadTp59d~F{cHGt{n8co8yCqdrHPlD+hy@pTsiVCyuYt_cx${LT zvVtpu%nhb-Z@&B{kh@AY$?-f3ca`_9v;$3j4l`BtU-|93CK;}Hx~(R5mRaI$?Y+xP zv`^JtIb`e*d2jxw6_RUi^-EvRioWqzWyw#ymzk$d?)<;w;$enVKa+%0`3w0SBrO9Z zShr|?C``Wi_}{dMFHbn8Ji1j^y1gWP?Wd3ZJG!|p*4?qRide0+B6{yD{_XMyug2A9 z2I$RrfBWug<&Pa}M0WpF=2}#Fe*S;PeSX(v&U)4Q&D^+T{yI(VBhGW4Cmpc~)4bVP zv7cY*V(H4|2`@{GbA8fv_Vdp&+ps{L^_p7aQkh3HudCb&d8PZ}ZNbiGq2@=L;uyug z?EUrhUcBU#U|Z%Ud9&+Iyqp1MO2L`YtA4G#CHCy`u~T)6B$v;R__X4vrow|n{c!OS(bPwsdI+UbW0XB|09(XqwU39u{*50bH?MCUt4y*g3+Y1yIHt*q(KU();j#0Ab zd8f{z%m$&t+0*%~&L`jBRIq-+J1s$pLzbJLy5|0_v6{nRDpmB7L#$+L)W;syzg9_( z_V!Jze?^^kw(x&f`W9FEA?D8geAkv(WSAZjm_iZ%*#bvwnP9rzx)gDc5?-i7sarjmWH-(%!m75nDQzPIR9y z&N1bPYn@bL`JF|s8_ET3>LYnIOS^ckPuXy8^$(4_15N8fOq*C^RoPctK8Rk%z`ZN) zKvUeJu#;>$FBV_+uiPlV&iR~eR$b{w$(yy0?!V=#V$lfK``&ufb7PH`bXrS51t;&5 z1H7lFSBqWq-1l-}h*|w**R=0Pb>q)1jnt3dC$m5&t>n1FOrc7b14q@L9-maVZ2qM; zCf;&ePkzdN^6X;C*^QIUCa>vRYi=IP+i$tNKX+C_<(nC6Pi95mC_N>XzLRO!-02Oh ze{U?)jG6VjZTs1OU-_ok)a6{(IX^l3%=9@G^;6$oF+Fa!FZG-L6GN|nS+%^zhke$r zQQu>vFKRK#brfBa?Sa_0sP2CK|Al+S+B~LT^f>ifjDLb)!t;4gf_g&FD zCn=Z3?krOMeQ>H@YP`;rok8=f_OHob@Mp#)0gc~oZ*0tyGn3+9Bwvocuye7@pFgHj zX^_o(qFkwg{%2N&uJ+oM6fS7u()T22_Tv2LCy#e*nrERheb+38>r>t=^X`9?(7mHe zSz5zC#&p@2IkP^Q^BDVaI_ti0UzQxOPfFwZx{tZ#agRAKD+a|LjF=a*eDb^a$0x69 z2J3CL{<+OM^qW@n<7;ayV;5aAJ?_Bq?|9cW360<-uYAj{PoMri-gwy;mQy=dx2LSH zyS$@Kayr|evniejCY-vhqwwO#gF`#L&2%|q{+B-JE-RRQ;LEmN|9{`?KKwAQdN%pl zda+Zb*}cB&JLhj&(!QtV{->1I=bBTqO20q&q3I&U9jbWsaScSSn<>ierY>{>R#B??sr}IcW0HV zQQBMg+ik*cc2D5i8}~`#bCU0}NtYIgUGIE*dg`XX&$rZi-AdnD>$Pz&tGnjCNTm?v z%?|_(Gom^4e((kD-=uG<3mJbE>(1Bu8MM%*?$C`dET{VSv}aA4=omS7 zrPuCY#q;Yu_uQCve&VzxIbZm>o=m#CTJ!dKt_ABq3bLde{`s^xWA^>kxpsRN1;x#u zA{sjH{NIaPLW;5;o9w?bf%lob;it-v)1o5!&p)`kqTMxPTG;Uitgc2s#~|O z3D!*J=$~TS+cU3aRos@zXC_@=J;nX}h6kS4uYX&*E&XK)*U~#P*S-p$G;fN^z8c8B z>_*iwi=f5IBO2p{%a>X{uFA@ ze%12i;@jmWX&QSOyxvEJ{Qt>+J>>pr#*Jsy!`(Bdda3p*I34=3L37^A>WA-wRMnO4 z7RJ4FZ!4X2N9jU)U*`O?RxPFTk^}x#Y3%*~d4AFR#%sHiw03Rx*`K!O>QS@fzNxkz zTlUFmR_GLn)qHBJJn^7#Y0`}XrHHfQynUJTFCO##dqE5|VRPMi=aO&sqQ45~tZaC` zWnsV~Lxt13mX`iZ?t zWh`#urMHDwSB6N;Ysz&+h^^67cgteYW@f3Zc9r}IbplqTztWo=HCVOcQ&8>&TO6=d_`f3 z=?1^!KlQc-G)JAae$2M^**Oo5Pp6ishkdSGeFFpYW2 zy}G(Md0YNdd!Hs*A6OT?a7l@i`A42BS$SO%XG=S-#%Nx5x7L3fI7xAiVZ_t}7PTdSIVm8n))Hp6MMfm!Yr%!nuD)%`mZmc(p^>VyBg-1ze3eUAK&Kth{jtzZe z1{xoo&iM4m&+A3&Ta9?TFH~oqoWEh|>zy7oULODF^78Sx1g9%9vjtz+F_rCjTX6av zX^=IbVI#RS)eFO&KJf%hd!0PbKC4gGLtdw>Zut$#_zibg&w3Z*eDr>isYB%tPm4N` zE%yaa&3w4?%mnR+2blxHE?k)LJnH4d#vji=nr^6L7yTG^X@J0R`F)@tT}uJXoelVbv(?@Vx8s59+->$BbekH56wIc3PW zG?Vqn{Pn&~tj~J6P8~h-&+Tv%kn_qSYr~A#e`*_ygZ;oa0ui2N?{bv7TJD2k6jJ zlUs^z#Xqq1i?%ziaqoI|>37?WA=mF)+-+IgV`!z(>$*PKeyODQw6uJacsaJEfexL< z+`Tt?K%?Hv7MQHk=WiAw0v5?QSr&eKQ?7pQk1z|%9INVYB_@p^Ggbveg}f5c&Fct1 z;l4V+;^PTnP|9-`_X-wk@#4GP=@5Bu%jY@Tpt5TPD6iLi-n(;hVE9s{XXht_y41%R zrWnTE`q!K>A@k5;H*-)rF=SAE+5g~!>%x}Rr{qCu+-1Eca~=KnnL)Mm;GOPvJ4TI_ z@@MAufvqpUze8xLQ6iW7(kU_Tg47msT7!(Z*m~*2J{uk{(x7t7rIM?wM3wu?X4hnZ zjpqu8+8}!B*~IDdaow^sML6=&-KU3o%0RvdY`nB2=Alc5?U8Jotq+-)o<7w3w6d2WH8)5z zEI28k@6uiKcZ-5N=hm(B)BLHH`~K#Zz5Aq6gHEn}+rk$(EBY%V$dHQ-bm$To5h!XMNU<_eczY2AVBKnZz;B?yC%CW4?gy1-!(8-Rm~^a6?Ep1hGF8N1xH#O zJ5O3XaZ=g8p+m2&d8Va#Tts=Zp@!jKlgak~-mkyVU#0c=-JGbOi+;U{+QrVMx@>+> z$e)9?`fHm1OSj6^98dmtNc`HL-HZ}bX4DCt`ft1AX=~|+`o$NU^XEr=c{FQ&w`1o^ z)&(*3C7-(;cm8?)^yQ|c8{e3CynO7rpQi2Qc$t~vH|g%P_yvv{{rvmmbe3KAJRjq- zY0}#ET>T>pj(p)>$n(x)r}BxKK#g!-(baP&Dc{)sN;A~sPFt@2u?0uIYz}zmmJ;i_ z`F?Kf!V6!IZ7$i%+4yy@u3t675sHeI``p7xZ5#vfA6 zU2n5}YxtpwJ9u@szB2|nr}}$t|BDRU(*1jDLoY8}fRhbZw^ea+B_DfR7lat?1@U=eiSlIJq zj;?o^*L2TETvtD-Jl|sR_i(_aM1fNc4-!{}t{@; z#?dTv`MlH5dYQNg{{=j?g{%;B`S))4cb;KNqhfem$ifKU&X?&={=DXqJon<@&NGkY z^w%uN0R`*IuZH&jxQ?!I=jZb{Ust&F`C3r4O^*8bvrYWkb8Q~>^--T6MeQvzWJ5Zu zCov!ilr&$OJOAYSCJ8<^t38u@gFoZth)aiN)*tXa{L0HG*<V`Tzg` diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png index 9c318c9390019883b1c6cf74d1acb74ab3a5485d..1bd69f05642777a7c42c27d0e7e27837c2a9defb 100644 GIT binary patch literal 42874 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 VoizJ&7#J8BJYD@<);T3K0RSzi%Mbtn literal 20073 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 diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index e28850ea927..211a129df79 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -116,9 +116,10 @@ \o Qt Quick Application (Built-in Elements) - Use built-in QML elements to design Qt Quick based user - interfaces with a custom look and feel and QML and C++ code to - implement the application logic + Use built-in QML elements to design user interfaces based on + Qt Quick 1 (Qt 4.7.1, or later) or Qt Quick 2 (Qt 5) with a + custom look and feel and QML and C++ code to implement the + application logic \o Qt Quick Application for MeeGo Harmattan diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index 27d87db53ae..80763000a40 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -50,6 +50,14 @@ custom look and feel, whereas the components provide the look and feel for a particular platform. + The Qt Quick 1 Application wizard imports Qt Quick 1.1, and + therefore, you can use it without changes to develop for platforms + that run Qt 4.7.4 (such as MeeGo). To develop for platforms that run + Qt 4.7.3 (such as Maemo), you must change the import statement to + import Qt Quick 1.0. + + The Qt Quick 2 Application wizard imports Qt Quick 2.0. Use it to + develop for platforms that run Qt 5. \o \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML file that contains the main view. You can review Qt Quick UI projects in the QML Viewer and you need not build them. You do not @@ -68,16 +76,6 @@ \endlist - \if defined(qcmanual) - \note Qt 4.7.3 supports Qt Quick 1.0 and Qt 4.7.4 supports Qt Quick 1.1. The - application wizards import Qt Quick 1.1, and therefore, you can use them - without changes if you target only platforms that run Qt 4.7.4 (such as - MeeGo or the desktop). If you also target platforms that run Qt 4.7.3 - (such as Maemo), you must change the import statement to - import Qt Quick 1.0. - \endif - - \section1 Creating Qt Quick UI Projects \list 1 From 68f2d2286ab66f51a0919002880c0e0b6ff8f53d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 26 Sep 2012 09:45:21 +0200 Subject: [PATCH 11/43] Squish: Set default compiler depending on arch Change-Id: I1be1c018e293bb8ac11ba24968e5ba3c391ccf92 Reviewed-by: Robert Loehning --- .../unix/Nokia/qtcreator/toolchains.xml | 1 + tests/system/shared/qtcreator.py | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml index 05a7e5e39b6..a2525c73ac0 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml +++ b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml @@ -10,6 +10,7 @@ x86-linux-generic-elf-64bit x86-linux-generic-elf-32bit + SET_BY_SQUISH false GCC ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 1bb7c5d3fcb..6ae6dc9cc4e 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -5,6 +5,7 @@ import glob; import atexit; import codecs; import subprocess; +import sys import errno; from datetime import datetime,timedelta; @@ -83,6 +84,69 @@ def substituteTildeWithinToolchains(settingsDir): os.remove(origToolchains) test.log("Substituted all tildes with '%s' inside toolchains.xml..." % home) +def __guessABI__(supportedABIs, use64Bit): + if use64Bit: + searchFor = "64bit" + else: + searchFor = "32bit" + for abi in supportedABIs: + if searchFor in abi: + return abi + if use64Bit: + test.log("Supported ABIs do not include an ABI supporting 64bit - trying 32bit now") + return __guessABI__(supportedABIs, False) + test.fatal('Could not guess ABI!', + 'Given ABIs: %s' % str(supportedABIs)) + return '' + +def __is64BitOS__(): + if platform.system() == 'Darwin': + return sys.maxsize > (2 ** 32) + if platform.system() in ('Microsoft', 'Windows'): + machine = os.getenv("PROCESSOR_ARCHITEW6432", os.getenv("PROCESSOR_ARCHITECTURE")) + else: + machine = platform.machine() + if machine: + return '64' in machine + else: + return False + +def substituteUnchosenTargetABIs(settingsDir): + class ReadState: + NONE = 0 + READING = 1 + CLOSED = 2 + + on64Bit = __is64BitOS__() + toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml') + origToolchains = toolchains + "_orig" + os.rename(toolchains, origToolchains) + origFile = open(origToolchains, "r") + modifiedFile = open(toolchains, "w") + supported = [] + readState = ReadState.NONE + for line in origFile: + if readState == ReadState.NONE: + if "SupportedAbis" in line: + supported = [] + readState = ReadState.READING + elif readState == ReadState.READING: + if "" in line: + readState = ReadState.CLOSED + else: + supported.append(line.split(">", 1)[1].rsplit("<", 1)[0]) + elif readState == ReadState.CLOSED: + if "SupportedAbis" in line: + supported = [] + readState = ReadState.READING + elif "SET_BY_SQUISH" in line: + line = line.replace("SET_BY_SQUISH", __guessABI__(supported, on64Bit)) + modifiedFile.write(line) + origFile.close() + modifiedFile.close() + os.remove(origToolchains) + test.log("Substituted unchosen ABIs inside toolchains.xml...") + if platform.system() in ('Windows', 'Microsoft'): sdkPath = "C:\\QtSDK" cwd = os.getcwd() # current dir is directory holding qtcreator.py @@ -103,5 +167,6 @@ if os.getenv("SYSTEST_NOSETTINGSPATH") != "1": shutil.copytree(cwd, tmpSettingsDir) if platform.system() in ('Linux', 'Darwin'): substituteTildeWithinToolchains(tmpSettingsDir) + substituteUnchosenTargetABIs(tmpSettingsDir) atexit.register(__removeTmpSettingsDir__) SettingsPath = ' -settingspath "%s"' % tmpSettingsDir From fa9dbd3bf67ddc65e958dea553756b281c681d20 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 28 Sep 2012 16:13:16 +0200 Subject: [PATCH 12/43] Android: check UI text for style and grammar Change-Id: I8b808cf374fcdc124c5b2b7d9a113e6d64b17f2f Reviewed-by: BogDan Vatra Reviewed-by: Leena Miettinen --- src/plugins/android/androidconfigurations.cpp | 2 +- .../androidcreatekeystorecertificate.ui | 4 ++-- src/plugins/android/androiddeploystep.cpp | 6 +++--- .../android/androiddeploystepfactory.cpp | 2 +- src/plugins/android/androiddeploystepwidget.ui | 6 +++--- .../android/androidpackagecreationwidget.cpp | 10 +++++----- src/plugins/android/androidqtversion.cpp | 2 +- src/plugins/android/androidruncontrol.cpp | 2 +- src/plugins/android/androidrunfactories.cpp | 2 +- src/plugins/android/androidrunner.cpp | 18 +++++++++--------- src/plugins/android/androidsettingswidget.cpp | 4 ++-- src/plugins/android/androidsettingswidget.ui | 8 ++++---- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 256c1f68ba3..66c66dfa9e7 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -438,7 +438,7 @@ bool AndroidConfigurations::createAVD(int minApiLevel) const avdDialog.targetComboBox->setModel(&model); if (!model.rowCount()) { QMessageBox::critical(0, tr("Error Creating AVD"), - tr("Cannot create a new AVD, no sufficiently recent Android SDK available.\n" + tr("Cannot create a new AVD. No sufficiently recent Android SDK available.\n" "Please install an SDK of at least API version %1."). arg(minApiLevel)); return false; diff --git a/src/plugins/android/androidcreatekeystorecertificate.ui b/src/plugins/android/androidcreatekeystorecertificate.ui index 553cdba0f66..ed0d4ecf8b7 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.ui +++ b/src/plugins/android/androidcreatekeystorecertificate.ui @@ -248,7 +248,7 @@ - City or Locality: + City or locality: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -261,7 +261,7 @@ - State or Province: + State or province: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index df8fc9867b1..a233c625b0d 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -255,7 +255,7 @@ bool AndroidDeployStep::deployPackage() QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt")); - writeOutput(tr("Deploy Qt libraries ... this may take some time, please wait")); + writeOutput(tr("Deploy Qt libraries. This may take some time, please wait.")); const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName; AndroidPackageCreationStep::removeDirectory(tempPath); QStringList stripFiles; @@ -299,13 +299,13 @@ bool AndroidDeployStep::deployPackage() if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) { - raiseError(tr("Package installation failed")); + raiseError(tr("Package installation failed.")); disconnect(deployProc, 0, this, 0); deployProc->deleteLater(); return false; } - writeOutput(tr("Pulling files necessary for debugging")); + writeOutput(tr("Pulling files necessary for debugging.")); runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("pull") << QLatin1String("/system/bin/app_process") diff --git a/src/plugins/android/androiddeploystepfactory.cpp b/src/plugins/android/androiddeploystepfactory.cpp index e7a6a6e9cdf..0ac3502b9ba 100644 --- a/src/plugins/android/androiddeploystepfactory.cpp +++ b/src/plugins/android/androiddeploystepfactory.cpp @@ -65,7 +65,7 @@ QList AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa QString AndroidDeployStepFactory::displayNameForId(const Core::Id id) const { if (id == AndroidDeployStep::Id) - return tr("Deploy to Android device/emulator"); + return tr("Deploy to Android device or emulator"); return QString(); } diff --git a/src/plugins/android/androiddeploystepwidget.ui b/src/plugins/android/androiddeploystepwidget.ui index 50e1eb620db..dd7c51e7842 100644 --- a/src/plugins/android/androiddeploystepwidget.ui +++ b/src/plugins/android/androiddeploystepwidget.ui @@ -59,7 +59,7 @@ You must have Qt libraries compiled for that platform - Edit rules file + Edit Rules File @@ -74,7 +74,7 @@ You must have Qt libraries compiled for that platform This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator). - Install Ministro system wide Qt shared libraries installer + Install Ministro, system-wide Qt shared libraries installer @@ -84,7 +84,7 @@ This option is useful when you want to try your application on devices which don false - Choose apk + Choose APK diff --git a/src/plugins/android/androidpackagecreationwidget.cpp b/src/plugins/android/androidpackagecreationwidget.cpp index 9dcf9b79a39..8b176ac7689 100644 --- a/src/plugins/android/androidpackagecreationwidget.cpp +++ b/src/plugins/android/androidpackagecreationwidget.cpp @@ -402,7 +402,7 @@ void AndroidPackageCreationWidget::prebundledLibMoveDown() void AndroidPackageCreationWidget::setHDPIIcon() { - QString file = QFileDialog::getOpenFileName(this, tr("Choose High DPI Icon"), QDir::homePath(), tr("png images (*.png)")); + QString file = QFileDialog::getOpenFileName(this, tr("Choose High DPI Icon"), QDir::homePath(), tr("PNG images (*.png)")); if (!file.length()) return; AndroidManager::setHighDpiIcon(m_step->target(), file); @@ -411,7 +411,7 @@ void AndroidPackageCreationWidget::setHDPIIcon() void AndroidPackageCreationWidget::setMDPIIcon() { - QString file = QFileDialog::getOpenFileName(this, tr("Choose Medium DPI Icon"), QDir::homePath(), tr("png images (*.png)")); + QString file = QFileDialog::getOpenFileName(this, tr("Choose Medium DPI Icon"), QDir::homePath(), tr("PNG images (*.png)")); if (!file.length()) return; AndroidManager::setMediumDpiIcon(m_step->target(), file); @@ -420,7 +420,7 @@ void AndroidPackageCreationWidget::setMDPIIcon() void AndroidPackageCreationWidget::setLDPIIcon() { - QString file = QFileDialog::getOpenFileName(this, tr("Choose Low DPI Icon"), QDir::homePath(), tr("png images (*.png)")); + QString file = QFileDialog::getOpenFileName(this, tr("Choose Low DPI Icon"), QDir::homePath(), tr("PNG images (*.png)")); if (!file.length()) return; AndroidManager::setLowDpiIcon(m_step->target(), file); @@ -437,8 +437,8 @@ void AndroidPackageCreationWidget::permissionActivated(QModelIndex index) void AndroidPackageCreationWidget::addPermission() { setEnabledSaveDiscardButtons(true); - m_ui->permissionsListView->setCurrentIndex(m_permissionsModel->addPermission(tr("< type or choose a permission >"))); - m_ui->permissionsComboBox->lineEdit()->setText(tr("< type or choose a permission >")); + m_ui->permissionsListView->setCurrentIndex(m_permissionsModel->addPermission(tr("< Type or choose a permission >"))); + m_ui->permissionsComboBox->lineEdit()->setText(tr("< Type or choose a permission >")); m_ui->permissionsComboBox->setFocus(); m_ui->removePermissionButton->setEnabled(m_permissionsModel->permissions().size()); } diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 026c82acea0..38a4d25759b 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -69,7 +69,7 @@ QString AndroidQtVersion::invalidReason() const { QString tmp = BaseQtVersion::invalidReason(); if (tmp.isEmpty() && qtAbis().isEmpty()) - return tr("Failed to detect the ABI(s) used by the Qt version."); + return tr("Failed to detect the ABIs used by the Qt version."); return tmp; } diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp index 0597668ebed..a03872fe593 100644 --- a/src/plugins/android/androidruncontrol.cpp +++ b/src/plugins/android/androidruncontrol.cpp @@ -66,7 +66,7 @@ void AndroidRunControl::start() SLOT(handleRemoteOutput(QByteArray))); connect(m_runner, SIGNAL(remoteProcessFinished(QString)), SLOT(handleRemoteProcessFinished(QString))); - appendMessage(tr("Starting remote process..."), Utils::NormalMessageFormat); + appendMessage(tr("Starting remote process."), Utils::NormalMessageFormat); m_runner->start(); } diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp index 206e44d4aaf..113cf9b1f9b 100644 --- a/src/plugins/android/androidrunfactories.cpp +++ b/src/plugins/android/androidrunfactories.cpp @@ -184,7 +184,7 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig, QString AndroidRunControlFactory::displayName() const { - return tr("Run on Android device/emulator"); + return tr("Run on Android device or emulator."); } } // namespace Internal diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 17d8695c9e6..8bcdd7d0a74 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -96,7 +96,7 @@ void AndroidRunner::checkPID() if (-1 != m_processPID && pid == -1) { m_processPID = -1; - emit remoteProcessFinished(tr("\n\n'%1' died").arg(m_packageName)); + emit remoteProcessFinished(tr("\n\n'%1' died.").arg(m_packageName)); return; } m_processPID = pid; @@ -151,11 +151,11 @@ void AndroidRunner::asyncStart() << QString::fromLatin1("localfilesystem:/data/data/%1/debug-socket").arg(m_packageName); adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments); if (!adbStarProc.waitForStarted()) { - emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1").arg(adbStarProc.errorString())); + emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1.").arg(adbStarProc.errorString())); return; } if (!adbStarProc.waitForFinished(-1)) { - emit remoteProcessFinished(tr("Failed to forward C++ debugging ports")); + emit remoteProcessFinished(tr("Failed to forward C++ debugging ports.")); return; } extraParams = QLatin1String("-e native_debug true -e gdbserver_socket +debug-socket"); @@ -167,11 +167,11 @@ void AndroidRunner::asyncStart() << QLatin1String("forward") << port << port; // currently forward to same port on device and host adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments); if (!adbStarProc.waitForStarted()) { - emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1").arg(adbStarProc.errorString())); + emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1.").arg(adbStarProc.errorString())); return; } if (!adbStarProc.waitForFinished(-1)) { - emit remoteProcessFinished(tr("Failed to forward QML debugging ports")); + emit remoteProcessFinished(tr("Failed to forward QML debugging ports.")); return; } extraParams+=QString::fromLatin1(" -e qml_debug true -e qmljsdebugger port:%1") @@ -196,12 +196,12 @@ void AndroidRunner::asyncStart() adbStarProc.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments); if (!adbStarProc.waitForStarted()) { - emit remoteProcessFinished(tr("Failed to start the activity. Reason: %1").arg(adbStarProc.errorString())); + emit remoteProcessFinished(tr("Failed to start the activity. Reason: %1.").arg(adbStarProc.errorString())); return; } if (!adbStarProc.waitForFinished(-1)) { adbStarProc.terminate(); - emit remoteProcessFinished(tr("Unable to start '%1'").arg(m_packageName)); + emit remoteProcessFinished(tr("Unable to start '%1'.").arg(m_packageName)); return; } QTime startTime = QTime::currentTime(); @@ -209,7 +209,7 @@ void AndroidRunner::asyncStart() checkPID(); } if (m_processPID == -1) { - emit remoteProcessFinished(tr("Cannot find %1 process").arg(m_packageName)); + emit remoteProcessFinished(tr("Cannot find %1 process.").arg(m_packageName)); return; } @@ -246,7 +246,7 @@ void AndroidRunner::stop() void AndroidRunner::asyncStop() { killPID(); - emit remoteProcessFinished(tr("\n\n'%1' killed").arg(m_packageName)); + emit remoteProcessFinished(tr("\n\n'%1' killed.").arg(m_packageName)); } void AndroidRunner::logcatReadStandardError() diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index ae6b7ac2294..71ccdbc0a0e 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -192,7 +192,7 @@ bool AndroidSettingsWidget::checkSDK(const Utils::FileName &location) || (!androidExe.appendPath(QLatin1String("/tools/android" ANDROID_EXE_SUFFIX)).toFileInfo().exists() && !androidBat.appendPath(QLatin1String("/tools/android" ANDROID_BAT_SUFFIX)).toFileInfo().exists()) || !emulator.appendPath(QLatin1String("/tools/emulator" ANDROID_EXE_SUFFIX)).toFileInfo().exists()) { - QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" doesn't seem to be an Android SDK top folder").arg(location.toUserOutput())); + QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" does not seem to be an Android SDK top folder.").arg(location.toUserOutput())); return false; } return true; @@ -213,7 +213,7 @@ bool AndroidSettingsWidget::checkNDK(const Utils::FileName &location) if (!platformPath.appendPath(QLatin1String("platforms")).toFileInfo().exists() || !toolChainPath.appendPath(QLatin1String("toolchains")).toFileInfo().exists() || !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).toFileInfo().exists()) { - QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" doesn't seem to be an Android NDK top folder").arg(location.toUserOutput())); + QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" does not seem to be an Android NDK top folder.").arg(location.toUserOutput())); return false; } m_androidConfig.ndkLocation = location; diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui index 1e7cba16af9..9d1c4f62f4d 100644 --- a/src/plugins/android/androidsettingswidget.ui +++ b/src/plugins/android/androidsettingswidget.ui @@ -59,7 +59,7 @@ - Android NDK toolchain version: + Android NDK tool chain version: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -92,7 +92,7 @@ - arm GDB location: + ARM GDB location: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -112,7 +112,7 @@ - arm GDBserver location: + ARM GDB server location: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -152,7 +152,7 @@ - x86 GDBserver location: + x86 GDB server location: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter From 6067411db4a9fcb9d73822f217912bb8619182a0 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 28 Sep 2012 15:21:04 +0200 Subject: [PATCH 13/43] Debugger: Remove old code Version specific snippets were introduced to avoid incompatibilities during Qt5 development. Change-Id: I60fa9beafc9d55b687c08e13cdf531baecb10fbb Reviewed-by: Kai Koehne --- src/libs/qmldebug/qdebugmessageclient.cpp | 35 ++++++------------- .../debugger/qml/qmlv8debuggerclient.cpp | 2 -- .../qml/qmlv8debuggerclientconstants.h | 1 - 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/libs/qmldebug/qdebugmessageclient.cpp b/src/libs/qmldebug/qdebugmessageclient.cpp index c6c6433e676..48ffa89b5b3 100644 --- a/src/libs/qmldebug/qdebugmessageclient.cpp +++ b/src/libs/qmldebug/qdebugmessageclient.cpp @@ -55,30 +55,17 @@ void QDebugMessageClient::messageReceived(const QByteArray &data) ds >> command; if (command == "MESSAGE") { - if (serviceVersion() == 1.0) { - QByteArray messagePacket; - ds >> messagePacket; - - QByteArray debugMessage; - int type; - QDataStream ms(messagePacket); - ms >> type >> debugMessage; - QDebugContextInfo info; - emit message(QtMsgType(type), QString::fromUtf8(debugMessage.data()), - info); - } else { - int type; - int line; - QByteArray debugMessage; - QByteArray file; - QByteArray function; - ds >> type >> debugMessage >> file >> line >> function; - QDebugContextInfo info; - info.line = line; - info.file = QString::fromUtf8(file); - info.function = QString::fromUtf8(function); - emit message(QtMsgType(type), QString::fromUtf8(debugMessage), info); - } + int type; + int line; + QByteArray debugMessage; + QByteArray file; + QByteArray function; + ds >> type >> debugMessage >> file >> line >> function; + QDebugContextInfo info; + info.line = line; + info.file = QString::fromUtf8(file); + info.function = QString::fromUtf8(function); + emit message(QtMsgType(type), QString::fromUtf8(debugMessage), info); } } diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index fd91502654d..52c4cb6efd2 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -978,8 +978,6 @@ QmlV8DebuggerClient::~QmlV8DebuggerClient() void QmlV8DebuggerClient::startSession() { - //Supports v2.0 and above - QTC_ASSERT(serviceVersion() >= CURRENT_SUPPORTED_VERSION, return); flushSendBuffer(); d->connect(); //Query for the V8 version. This is diff --git a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h index 19935617c22..2f7c8f0ba47 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h +++ b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h @@ -34,7 +34,6 @@ namespace Debugger { namespace Internal { -const float CURRENT_SUPPORTED_VERSION = 2.0; const char V8REQUEST[] = "v8request"; const char V8MESSAGE[] = "v8message"; const char BREAKONSIGNAL[] = "breakonsignal"; From b0f7810072082b35ee19288916012929bdd78397 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:16:03 +0200 Subject: [PATCH 14/43] UI text: fix capitalization and punctuation. Change-Id: Ib0dfa00b827830365ce4482b14da3668bcadd142 Reviewed-by: hjk --- src/libs/zeroconf/avahiLib.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/zeroconf/avahiLib.cpp b/src/libs/zeroconf/avahiLib.cpp index 69b9993781b..d23eccc4c4d 100644 --- a/src/libs/zeroconf/avahiLib.cpp +++ b/src/libs/zeroconf/avahiLib.cpp @@ -346,7 +346,7 @@ public: if (m_simplePollFree) m_simplePollFree(connection->simple_poll); delete connection; - setError(true, ZConfLib::tr("%1 could not create a client (probably the daemon is not running)").arg(name())); + setError(true, ZConfLib::tr("%1 cannot create a client. The daemon is probably not running.").arg(name())); return kDNSServiceErr_Unknown; } *sdRef = reinterpret_cast(connection); @@ -472,16 +472,16 @@ extern "C" void cAvahiClientReply (AvahiClient * /*s*/, AvahiClientState state, break; case (AVAHI_CLIENT_S_COLLISION): /* Server state: COLLISION */ - lib->setError(true, ZConfLib::tr("cAvahiClient, server collision")); + lib->setError(true, ZConfLib::tr("cAvahiClient, server collision.")); break; case (AVAHI_CLIENT_FAILURE): - lib->setError(true, ZConfLib::tr("cAvahiClient, some kind of error happened on the client side")); + lib->setError(true, ZConfLib::tr("cAvahiClient, an error occurred on the client side.")); break; case (AVAHI_CLIENT_CONNECTING): - lib->setError(false, ZConfLib::tr("cAvahiClient, still connecting, no server available")); + lib->setError(false, ZConfLib::tr("cAvahiClient, still connecting, no server available.")); break; default: - lib->setError(true, ZConfLib::tr("unexpected state %1 in cAvahiClientReply") + lib->setError(true, ZConfLib::tr("Unexpected state %1 in cAvahiClientReply.") .arg(state)); } } @@ -532,7 +532,7 @@ extern "C" void cAvahiBrowseReply( break; default: browser->mainConnection->lib->setError(true, ZConfLib::tr( - "unexpected state %1 in cAvahiBrowseReply") + "Unexpected state %1 in cAvahiBrowseReply.") .arg(event)); } } From a92e6fced0bbc0e8aa1343d5fdd01c2bf6ec52d2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 28 Sep 2012 12:50:29 +0200 Subject: [PATCH 15/43] Give a qWarning when restoration of kits failed Change-Id: I5b714d04f40aee6365520fd1b6f76ee1ca7d4cba Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/kitmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index e90cd6dfe86..b5093acc26f 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -284,14 +284,18 @@ KitManager::KitList KitManager::restoreKits(const Utils::FileName &fileName) KitList result; PersistentSettingsReader reader; - if (!reader.load(fileName)) + if (!reader.load(fileName)) { + qWarning("Warning: Failed to read \"%s\", can not restore kits!", qPrintable(fileName.toUserOutput())); return result; + } QVariantMap data = reader.restoreValues(); // Check version: int version = data.value(QLatin1String(KIT_FILE_VERSION_KEY), 0).toInt(); - if (version < 1) + if (version < 1) { + qWarning("Warning: Kit file version %d not supported, can not restore kits!", version); return result; + } const int count = data.value(QLatin1String(KIT_COUNT_KEY), 0).toInt(); for (int i = 0; i < count; ++i) { From 28c0929f9eb6841c8d9b2c60b383eb13cb9cfc04 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:07:12 +0200 Subject: [PATCH 16/43] UI text: fix capitalization and punctuation Change-Id: I7a974072096689aaa4b1ec1cca93dcd9febe14d9 Reviewed-by: Aurindam Jana --- src/plugins/debugger/qml/qmladapter.cpp | 10 +++++----- src/plugins/debugger/qml/qmlinspectoragent.cpp | 4 ++-- src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp index 05da501875d..eb6747eb013 100644 --- a/src/plugins/debugger/qml/qmladapter.cpp +++ b/src/plugins/debugger/qml/qmladapter.cpp @@ -144,20 +144,20 @@ void QmlAdapter::connectionStateChanged() switch (m_conn->state()) { case QAbstractSocket::UnconnectedState: { - showConnectionStatusMessage(tr("disconnected.\n\n")); + showConnectionStatusMessage(tr("Disconnected.\n\n")); emit disconnected(); break; } case QAbstractSocket::HostLookupState: - showConnectionStatusMessage(tr("resolving host...")); + showConnectionStatusMessage(tr("Resolving host.")); break; case QAbstractSocket::ConnectingState: - showConnectionStatusMessage(tr("connecting to debug server...")); + showConnectionStatusMessage(tr("Connecting to debug server.")); break; case QAbstractSocket::ConnectedState: { - showConnectionStatusMessage(tr("connected.\n")); + showConnectionStatusMessage(tr("Connected.\n")); m_connectionTimer.stop(); @@ -166,7 +166,7 @@ void QmlAdapter::connectionStateChanged() break; } case QAbstractSocket::ClosingState: - showConnectionStatusMessage(tr("closing...")); + showConnectionStatusMessage(tr("Closing.")); break; case QAbstractSocket::BoundState: case QAbstractSocket::ListeningState: diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index c6fe7cb375e..589be454c24 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -424,7 +424,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value, } else if (type == "SET_BINDING_R" || type == "RESET_BINDING_R" || type == "SET_METHOD_BODY_R") { - QString msg = QLatin1String(type) + tr(" success : "); + QString msg = QLatin1String(type) + tr("Success: "); msg += value.toBool() ? QLatin1Char('1') : QLatin1Char('0'); if (!value.toBool()) emit automaticUpdateFailed(); @@ -814,7 +814,7 @@ QList QmlInspectorAgent::buildWatchData(const ObjectReference &obj, WatchData propertiesWatch; propertiesWatch.id = objDebugId; propertiesWatch.exp = ""; - propertiesWatch.name = tr("properties"); + propertiesWatch.name = tr("Properties"); propertiesWatch.iname = objIname + ".[properties]"; propertiesWatch.type = ""; propertiesWatch.value = _("list"); diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 52c4cb6efd2..19bcc0fdc91 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -1633,7 +1633,7 @@ StackFrame QmlV8DebuggerClient::extractStackFrame(const QVariant &bodyVal, const QmlV8ObjectData objectData = d->extractData(body.value(_("func")), refsVal); QString functionName = objectData.value.toString(); if (functionName.isEmpty()) - functionName = tr("anonymous function"); + functionName = tr("Anonymous Function"); stackFrame.function = functionName; objectData = d->extractData(body.value(_("script")), refsVal); From cd807f974d7a839bbe1fef672440b80ef94e7873 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:08:24 +0200 Subject: [PATCH 17/43] UI text: fix capitalization and unify message style Change-Id: Ib5e24e6d697e5ce9c3960adecee5b015f7dee450 Reviewed-by: Christian Kandeler --- src/libs/ssh/sshkeycreationdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/ssh/sshkeycreationdialog.cpp b/src/libs/ssh/sshkeycreationdialog.cpp index 287ea8e21ac..d3d59a88f0c 100644 --- a/src/libs/ssh/sshkeycreationdialog.cpp +++ b/src/libs/ssh/sshkeycreationdialog.cpp @@ -106,7 +106,7 @@ void SshKeyCreationDialog::saveKeys() { const QString parentDir = QFileInfo(privateKeyFilePath()).dir().path(); if (!QDir::root().mkpath(parentDir)) { - QMessageBox::critical(this, tr("Failure To Save Key File"), + QMessageBox::critical(this, tr("Cannot Save Key File"), tr("Failed to create directory: '%1'.").arg(parentDir)); return; } @@ -114,7 +114,7 @@ void SshKeyCreationDialog::saveKeys() QFile privateKeyFile(privateKeyFilePath()); if (!privateKeyFile.open(QIODevice::WriteOnly) || !privateKeyFile.write(m_keyGenerator->privateKey())) { - QMessageBox::critical(this, tr("Saving Private Key File failed"), + QMessageBox::critical(this, tr("Cannot Save Private Key File"), tr("The private key file could not be saved: %1").arg(privateKeyFile.errorString())); return; } @@ -123,7 +123,7 @@ void SshKeyCreationDialog::saveKeys() QFile publicKeyFile(publicKeyFilePath()); if (!publicKeyFile.open(QIODevice::WriteOnly) || !publicKeyFile.write(m_keyGenerator->publicKey())) { - QMessageBox::critical(this, tr("Saving Public Key File failed"), + QMessageBox::critical(this, tr("Cannot Save Public Key File"), tr("The public key file could not be saved: %1").arg(publicKeyFile.errorString())); return; } From ceb9319e4bbbc849ebed8f6103bc8710ff7e4b79 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 1 Oct 2012 11:46:36 +0200 Subject: [PATCH 18/43] Offer to import builds not done by this Qt Creator instance Change-Id: I7dd8d3b8ae919808fd7089079dcd5583ebc89913 Reviewed-by: Daniel Teske --- .../qt4projectmanager/wizards/targetsetuppage.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index fa822d067fb..350030eccb5 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -511,20 +511,25 @@ void TargetSetupPage::setupImports() if (!m_importSearch || m_proFilePath.isEmpty()) return; - QString sourceDir = QFileInfo(m_proFilePath).absolutePath(); - import(Utils::FileName::fromString(sourceDir), true); + QFileInfo pfi(m_proFilePath); + const QString prefix = pfi.baseName(); + QStringList toImport; + toImport << pfi.absolutePath(); QList kitList = ProjectExplorer::KitManager::instance()->kits(); foreach (ProjectExplorer::Kit *k, kitList) { QFileInfo fi(Qt4Project::shadowBuildDirectory(m_proFilePath, k, QString())); const QString baseDir = fi.absolutePath(); - const QString prefix = fi.baseName(); foreach (const QString &dir, QDir(baseDir).entryList()) { - if (dir.startsWith(prefix)) - import(Utils::FileName::fromString(baseDir + QLatin1Char('/') + dir), true); + const QString path = baseDir + QLatin1Char('/') + dir; + if (dir.startsWith(prefix) && !toImport.contains(path)) + toImport << path; + } } + foreach (const QString &path, toImport) + import(Utils::FileName::fromString(path), true); } void TargetSetupPage::handleKitAddition(ProjectExplorer::Kit *k) From bb00f59d66a87a63987f93f83db9d36b18be433b Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 28 Sep 2012 14:40:57 +0200 Subject: [PATCH 19/43] Debugger: Client for DeclarativeDebugger A client for DeclarativeDebugger Service. The service is a backport of QmlDebugger service. Change-Id: I868a286756c2d6bcbb2f41904a13d7f691e9704c Reviewed-by: Christiaan Janssen --- src/libs/qmldebug/baseenginedebugclient.cpp | 24 ++++----- ...t.cpp => declarativeenginedebugclient.cpp} | 28 +++++----- .../qmldebug/declarativeenginedebugclient.h | 16 ++++-- .../qmldebug/declarativeenginedebugclientv2.h | 51 +++++++++++++++++++ src/libs/qmldebug/qmldebug-lib.pri | 5 +- src/libs/qmldebug/qmldebug.qbs | 3 +- src/libs/qmldebug/qmldebugconstants.h | 3 +- src/libs/qmldebug/qmlenginedebugclient.h | 16 ++---- .../debugger/qml/qmlinspectoradapter.cpp | 11 ++++ .../debugger/qml/qmlinspectoragent.cpp | 35 ++++++------- 10 files changed, 125 insertions(+), 67 deletions(-) rename src/libs/qmldebug/{qmlenginedebugclient.cpp => declarativeenginedebugclient.cpp} (77%) create mode 100644 src/libs/qmldebug/declarativeenginedebugclientv2.h diff --git a/src/libs/qmldebug/baseenginedebugclient.cpp b/src/libs/qmldebug/baseenginedebugclient.cpp index a669d59f6b2..15acd7a6c1a 100644 --- a/src/libs/qmldebug/baseenginedebugclient.cpp +++ b/src/libs/qmldebug/baseenginedebugclient.cpp @@ -76,8 +76,8 @@ void BaseEngineDebugClient::decode(QDataStream &ds, QmlObjectData data; ds >> data; int parentId = -1; - if (objectName() == QLatin1String("QmlDebugger") && - serviceVersion() >= Constants::CURRENT_SUPPORTED_VERSION ) + // qt > 4.8.3 + if (objectName() != QLatin1String(Constants::QDECLARATIVE_ENGINE)) ds >> parentId; o.m_debugId = data.objectId; o.m_className = data.objectType; @@ -184,19 +184,15 @@ void BaseEngineDebugClient::messageReceived(const QByteArray &data) QDataStream ds(data); int queryId; QByteArray type; - ds >> type; + ds >> type >> queryId; if (type == "OBJECT_CREATED") { int engineId; int objectId; - ds >> engineId >> objectId; - emit newObject(engineId, objectId, -1); - return; - } - - ds >> queryId; - - if (type == "LIST_ENGINES_R") { + int parentId; + ds >> engineId >> objectId >> parentId; + emit newObject(engineId, objectId, parentId); + } else if (type == "LIST_ENGINES_R") { int count; ds >> count; QList engines; @@ -398,7 +394,7 @@ quint32 BaseEngineDebugClient::setBindingForObject( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("SET_BINDING") << objectDebugId << propertyName + ds << QByteArray("SET_BINDING") << id << objectDebugId << propertyName << bindingExpression << isLiteralValue << source << line; sendMessage(message); } @@ -414,7 +410,7 @@ quint32 BaseEngineDebugClient::resetBindingForObject( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName; + ds << QByteArray("RESET_BINDING") << id << objectDebugId << propertyName; sendMessage(message); } return id; @@ -429,7 +425,7 @@ quint32 BaseEngineDebugClient::setMethodBody( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("SET_METHOD_BODY") << objectDebugId + ds << QByteArray("SET_METHOD_BODY") << id << objectDebugId << methodName << methodBody; sendMessage(message); } diff --git a/src/libs/qmldebug/qmlenginedebugclient.cpp b/src/libs/qmldebug/declarativeenginedebugclient.cpp similarity index 77% rename from src/libs/qmldebug/qmlenginedebugclient.cpp rename to src/libs/qmldebug/declarativeenginedebugclient.cpp index 07c69a497cc..2a5191e2a18 100644 --- a/src/libs/qmldebug/qmlenginedebugclient.cpp +++ b/src/libs/qmldebug/declarativeenginedebugclient.cpp @@ -27,18 +27,18 @@ ** **************************************************************************/ -#include "qmlenginedebugclient.h" +#include "declarativeenginedebugclient.h" #include "qmldebugconstants.h" namespace QmlDebug { -QmlEngineDebugClient::QmlEngineDebugClient( +DeclarativeEngineDebugClient::DeclarativeEngineDebugClient( QmlDebugConnection *connection) - : BaseEngineDebugClient(QLatin1String(Constants::QML_DEBUGGER), connection) + : BaseEngineDebugClient(QLatin1String(Constants::QDECLARATIVE_ENGINE), connection) { } -quint32 QmlEngineDebugClient::setBindingForObject( +quint32 DeclarativeEngineDebugClient::setBindingForObject( int objectDebugId, const QString &propertyName, const QVariant &bindingExpression, @@ -50,14 +50,14 @@ quint32 QmlEngineDebugClient::setBindingForObject( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("SET_BINDING") << id << objectDebugId << propertyName + ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue << source << line; sendMessage(message); } return id; } -quint32 QmlEngineDebugClient::resetBindingForObject( +quint32 DeclarativeEngineDebugClient::resetBindingForObject( int objectDebugId, const QString &propertyName) { @@ -66,13 +66,13 @@ quint32 QmlEngineDebugClient::resetBindingForObject( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("RESET_BINDING") << id << objectDebugId << propertyName; + ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName; sendMessage(message); } return id; } -quint32 QmlEngineDebugClient::setMethodBody( +quint32 DeclarativeEngineDebugClient::setMethodBody( int objectDebugId, const QString &methodName, const QString &methodBody) { @@ -81,26 +81,24 @@ quint32 QmlEngineDebugClient::setMethodBody( id = getId(); QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); - ds << QByteArray("SET_METHOD_BODY") << id << objectDebugId + ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody; sendMessage(message); } return id; } -void QmlEngineDebugClient::messageReceived(const QByteArray &data) +void DeclarativeEngineDebugClient::messageReceived(const QByteArray &data) { QDataStream ds(data); - int queryId; QByteArray type; - ds >> type >> queryId; + ds >> type; if (type == "OBJECT_CREATED") { int engineId; int objectId; - int parentId; - ds >> engineId >> objectId >> parentId; - emit newObject(engineId, objectId, parentId); + ds >> engineId >> objectId; + emit newObject(engineId, objectId, -1); return; } else { BaseEngineDebugClient::messageReceived(data); diff --git a/src/libs/qmldebug/declarativeenginedebugclient.h b/src/libs/qmldebug/declarativeenginedebugclient.h index 5cfe28279ff..2807163ff0e 100644 --- a/src/libs/qmldebug/declarativeenginedebugclient.h +++ b/src/libs/qmldebug/declarativeenginedebugclient.h @@ -40,10 +40,18 @@ class QMLDEBUG_EXPORT DeclarativeEngineDebugClient : public BaseEngineDebugClien { Q_OBJECT public: - DeclarativeEngineDebugClient(QmlDebugConnection *conn) - : BaseEngineDebugClient(QLatin1String("QDeclarativeEngine"), conn) - { - } + explicit DeclarativeEngineDebugClient(QmlDebugConnection *conn); + + quint32 setBindingForObject(int objectDebugId, const QString &propertyName, + const QVariant &bindingExpression, + bool isLiteralValue, + QString source, int line); + quint32 resetBindingForObject(int objectDebugId, const QString &propertyName); + quint32 setMethodBody(int objectDebugId, const QString &methodName, + const QString &methodBody); + +protected: + void messageReceived(const QByteArray &data); }; } // namespace QmlDebug diff --git a/src/libs/qmldebug/declarativeenginedebugclientv2.h b/src/libs/qmldebug/declarativeenginedebugclientv2.h new file mode 100644 index 00000000000..6db57439350 --- /dev/null +++ b/src/libs/qmldebug/declarativeenginedebugclientv2.h @@ -0,0 +1,51 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: http://www.qt-project.org/ +** +** GNU Lesser General Public License Usage +** +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +**************************************************************************/ + +#ifndef DECLARATIVEENGINEDEBUGCLIENTV2_H +#define DECLARATIVEENGINEDEBUGCLIENTV2_H + +#include "baseenginedebugclient.h" + +namespace QmlDebug { + +class QmlDebugConnection; + +class QMLDEBUG_EXPORT DeclarativeEngineDebugClientV2 : public BaseEngineDebugClient +{ + Q_OBJECT +public: + explicit DeclarativeEngineDebugClientV2(QmlDebugConnection *conn) + : BaseEngineDebugClient(QLatin1String("DeclarativeDebugger"), conn) + { + } +}; + +} // namespace QmlDebug + +#endif // DECLARATIVEENGINEDEBUGCLIENTV2_H diff --git a/src/libs/qmldebug/qmldebug-lib.pri b/src/libs/qmldebug/qmldebug-lib.pri index a1406ee580e..54f09258b07 100644 --- a/src/libs/qmldebug/qmldebug-lib.pri +++ b/src/libs/qmldebug/qmldebug-lib.pri @@ -11,6 +11,7 @@ HEADERS += \ $$PWD/qmldebugclient.h \ $$PWD/baseenginedebugclient.h \ $$PWD/declarativeenginedebugclient.h \ + $$PWD/declarativeenginedebugclientv2.h \ $$PWD/qmloutputparser.h \ $$PWD/qmldebug_global.h \ $$PWD/qmlprofilereventtypes.h \ @@ -32,8 +33,8 @@ SOURCES += \ $$PWD/qpacketprotocol.cpp \ $$PWD/qv8profilerclient.cpp \ $$PWD/qdebugmessageclient.cpp \ - $$PWD/qmlenginedebugclient.cpp \ $$PWD/basetoolsclient.cpp \ $$PWD/declarativetoolsclient.cpp \ - $$PWD/qmltoolsclient.cpp + $$PWD/qmltoolsclient.cpp \ + $$PWD/declarativeenginedebugclient.cpp diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs index c9fa8c01a4d..c2e8a40996c 100644 --- a/src/libs/qmldebug/qmldebug.qbs +++ b/src/libs/qmldebug/qmldebug.qbs @@ -20,7 +20,9 @@ QtcLibrary { "baseenginedebugclient.h", "basetoolsclient.cpp", "basetoolsclient.h", + "declarativeenginedebugclient.cpp", "declarativeenginedebugclient.h", + "declarativeenginedebugclientv2.h", "declarativetoolsclient.cpp", "declarativetoolsclient.h", "qdebugmessageclient.cpp", @@ -37,7 +39,6 @@ QtcLibrary { "qmlprofilertraceclient.h", "qpacketprotocol.cpp", "qpacketprotocol.h", - "qmlenginedebugclient.cpp", "qmlenginedebugclient.h", "qv8profilerclient.cpp", "qv8profilerclient.h", diff --git a/src/libs/qmldebug/qmldebugconstants.h b/src/libs/qmldebug/qmldebugconstants.h index 36ccf4fb9e4..147d4f62ec9 100644 --- a/src/libs/qmldebug/qmldebugconstants.h +++ b/src/libs/qmldebug/qmldebugconstants.h @@ -42,8 +42,7 @@ const char STR_IGNORING_DEBUGGER[] = "Ignoring \"-qmljsdebugger="; const char STR_IGNORING_DEBUGGER2[] = "Ignoring\"-qmljsdebugger="; // There is (was?) a bug in one of the error strings - safest to handle both const char STR_CONNECTION_ESTABLISHED[] = "Connection established"; -const char QML_DEBUGGER[] = "QmlDebugger"; -const float CURRENT_SUPPORTED_VERSION = 2.0; +const char QDECLARATIVE_ENGINE[] = "QDeclarativeEngine"; } // namespace Constants } // namespace QmlDebug diff --git a/src/libs/qmldebug/qmlenginedebugclient.h b/src/libs/qmldebug/qmlenginedebugclient.h index eea286b810c..7231d65d7d3 100644 --- a/src/libs/qmldebug/qmlenginedebugclient.h +++ b/src/libs/qmldebug/qmlenginedebugclient.h @@ -40,18 +40,10 @@ class QMLDEBUG_EXPORT QmlEngineDebugClient : public BaseEngineDebugClient { Q_OBJECT public: - explicit QmlEngineDebugClient(QmlDebugConnection *conn); - - quint32 setBindingForObject(int objectDebugId, const QString &propertyName, - const QVariant &bindingExpression, - bool isLiteralValue, - QString source, int line); - quint32 resetBindingForObject(int objectDebugId, const QString &propertyName); - quint32 setMethodBody(int objectDebugId, const QString &methodName, - const QString &methodBody); - -protected: - void messageReceived(const QByteArray &data); + explicit QmlEngineDebugClient(QmlDebugConnection *conn) + : BaseEngineDebugClient(QLatin1String("QmlDebugger"), conn) + { + } }; } // namespace QmlDebug diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp index 9528a1d5aff..677bbe99975 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp +++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -96,13 +97,23 @@ QmlInspectorAdapter::QmlInspectorAdapter(QmlAdapter *debugAdapter, connect(engineClient2, SIGNAL(newStatus(QmlDebug::ClientStatus)), this, SLOT(engineClientStatusChanged(QmlDebug::ClientStatus))); + DeclarativeEngineDebugClientV2 *engineClient3 + = new DeclarativeEngineDebugClientV2(connection); + connect(engineClient3, SIGNAL(newStatus(QmlDebug::ClientStatus)), + this, SLOT(clientStatusChanged(QmlDebug::ClientStatus))); + connect(engineClient3, SIGNAL(newStatus(QmlDebug::ClientStatus)), + this, SLOT(engineClientStatusChanged(QmlDebug::ClientStatus))); + m_engineClients.insert(engineClient1->name(), engineClient1); m_engineClients.insert(engineClient2->name(), engineClient2); + m_engineClients.insert(engineClient3->name(), engineClient3); if (engineClient1->status() == QmlDebug::Enabled) setActiveEngineClient(engineClient1); if (engineClient2->status() == QmlDebug::Enabled) setActiveEngineClient(engineClient2); + if (engineClient3->status() == QmlDebug::Enabled) + setActiveEngineClient(engineClient3); DeclarativeToolsClient *toolsClient1 = new DeclarativeToolsClient(connection); connect(toolsClient1, SIGNAL(newStatus(QmlDebug::ClientStatus)), diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 589be454c24..21734dbd9a1 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -42,6 +42,7 @@ #include using namespace QmlDebug; +using namespace QmlDebug::Constants; namespace Debugger { namespace Internal { @@ -476,7 +477,7 @@ void QmlInspectorAgent::newObject(int engineId, int objectId, int /*parentId*/) return; m_newObjectsCreated = true; - if (m_engineClient->objectName() == QLatin1String(QmlDebug::Constants::QML_DEBUGGER)) + if (m_engineClient->objectName() != QLatin1String(QDECLARATIVE_ENGINE)) fetchObject(objectId); else m_delayQueryTimer.start(); @@ -595,13 +596,13 @@ void QmlInspectorAgent::fetchObjectsInContextRecursive(const ContextReference &c foreach (const ObjectReference & obj, context.objects()) { using namespace QmlDebug::Constants; - if (m_engineClient->objectName() == QLatin1String(QML_DEBUGGER) && - m_engineClient->serviceVersion() >= CURRENT_SUPPORTED_VERSION) { - //Fetch only root objects + // qt <= 4.8.3 + if (m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { + m_objectTreeQueryIds << m_engineClient->queryObjectRecursive(obj.debugId()); + } else { + // Fetch only root objects for qt > 4.8.3 if (obj.parentId() == -1) fetchObject(obj.debugId()); - } else { - m_objectTreeQueryIds << m_engineClient->queryObjectRecursive(obj.debugId()); } } foreach (const ContextReference &child, context.contexts()) @@ -628,8 +629,8 @@ void QmlInspectorAgent::objectTreeFetched(const ObjectReference &object) ObjectReference last; QStack stack; - // 4.x - if (m_newObjectsCreated && m_engineClient->objectName() != QLatin1String(QmlDebug::Constants::QML_DEBUGGER)) { + // qt <= 4.8.3 + if (m_newObjectsCreated && m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { // We need to reverse the stack as the root objects // are pushed to the bottom since they are fetched first. // The child objects need to placed in the correct position and therefore @@ -645,8 +646,8 @@ void QmlInspectorAgent::objectTreeFetched(const ObjectReference &object) int parentId = last.parentId(); QByteArray parentIname; - // 4.x - if (m_engineClient->objectName() != QLatin1String(QmlDebug::Constants::QML_DEBUGGER)) { + // qt <= 4.8.3 + if (m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { QHashIterator > i(m_debugIdChildIds); while (i.hasNext()) { i.next(); @@ -662,8 +663,8 @@ void QmlInspectorAgent::objectTreeFetched(const ObjectReference &object) fetchObject(parentId); return; } - // 5.x - if (m_engineClient->objectName() == QLatin1String(QmlDebug::Constants::QML_DEBUGGER) + // qt > 4.8.3 + if (m_engineClient->objectName() != QLatin1String(QDECLARATIVE_ENGINE) && m_newObjectsCreated && parentIname.isEmpty()) { if (watchData.count()) break; @@ -735,13 +736,13 @@ void QmlInspectorAgent::buildDebugIdHashRecursive(const ObjectReference &ref) m_debugIdHash[file][location].append(ref.debugId()); m_debugIdLocations.insert(ref.debugId(), FileReference(filePath, lineNum, colNum)); - // 4.x - if (m_newObjectsCreated && m_engineClient->objectName() != QLatin1String(QmlDebug::Constants::QML_DEBUGGER)) { + // qt <= 4.8.3 + if (m_newObjectsCreated && m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { QList childIds; foreach (const ObjectReference &c, ref.children()) { childIds << c.debugId(); } - // For 4.x, we do not get the parentId. Hence, store the child ids + // For qt <= 4.8.3, we do not get the parentId. Hence, store the child ids // to look up correct insertion places later m_debugIdChildIds.insert(ref.debugId(), childIds); } @@ -877,8 +878,8 @@ void QmlInspectorAgent::clearObjectTree() m_debugIdToIname.clear(); m_debugIdChildIds.clear(); m_objectStack.clear(); - // reset only for 5.x. - if (m_engineClient->objectName() == QLatin1String(QmlDebug::Constants::QML_DEBUGGER)) + // reset only for qt > 4.8.3. + if (m_engineClient->objectName() != QLatin1String(QDECLARATIVE_ENGINE)) m_newObjectsCreated = false; removeAllObjectWatches(); From 5ec5c2d772ac03e9168e8c334155bd76879bb923 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:13:04 +0200 Subject: [PATCH 20/43] UI text: fix capitalization and punctuation. Change-Id: Ic312b7f78a65c7a2f17f3186f4f0ce7f0c1cf2ee Reviewed-by: Christiaan Janssen --- src/plugins/qmlprofiler/qmlprofilereventview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index 5147bcea080..5b88f1551e0 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -184,7 +184,7 @@ void QmlProfilerEventsWidget::switchToV8View() d->m_eventTree->setViewType(QmlProfilerEventsMainView::V8ProfileView); d->m_eventParents->setViewType(QmlProfilerEventsParentsAndChildrenView::V8ParentsView); d->m_eventChildren->setViewType(QmlProfilerEventsParentsAndChildrenView::V8ChildrenView); - setToolTip(tr("Trace information from the v8 JavaScript engine. Available only in Qt5 based applications")); + setToolTip(tr("Trace information from the v8 JavaScript engine. Available only in Qt5 based applications.")); } void QmlProfilerEventsWidget::clear() @@ -614,7 +614,7 @@ void QmlProfilerEventsMainView::QmlProfilerEventsMainViewPrivate::buildModelFrom typeString = typeString + tr(" (Opt)"); toolTipText = tr("Binding is evaluated by the optimized engine."); } else if (binding->bindingType == (int)V8Binding) { - toolTipText = tr("Binding not optimized (eg. has side effects or assignments,\n" + toolTipText = tr("Binding not optimized (e.g. has side effects or assignments,\n" "references to elements in other files, loops, etc.)"); } @@ -681,7 +681,7 @@ void QmlProfilerEventsMainView::QmlProfilerEventsMainViewPrivate::buildModelFrom if (binding->isBindingLoop) foreach (QStandardItem *item, newRow) { item->setBackground(colors()->bindingLoopBackground); - item->setToolTip(tr("Binding loop detected")); + item->setToolTip(tr("Binding loop detected.")); } // append @@ -1041,7 +1041,7 @@ void QmlProfilerEventsParentsAndChildrenView::rebuildTree(void *profilerDataMode if (event->inLoopPath) foreach (QStandardItem *item, newRow) { item->setBackground(colors()->bindingLoopBackground); - item->setToolTip(tr("Part of binding loop")); + item->setToolTip(tr("Part of binding loop.")); } } else { QV8EventSub *event = v8List->at(index); From aece556c1ddfc9ebedeaf31b511854d9f868f9a2 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:15:26 +0200 Subject: [PATCH 21/43] UI text: fix capitalization Change-Id: Idcad814afc9e12256821106ee3272391ad95c8ef Reviewed-by: Christian Kandeler --- src/libs/ssh/sftpchannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ssh/sftpchannel.cpp b/src/libs/ssh/sftpchannel.cpp index 152afaa4535..bba482ae9d1 100644 --- a/src/libs/ssh/sftpchannel.cpp +++ b/src/libs/ssh/sftpchannel.cpp @@ -272,7 +272,7 @@ void SftpChannelPrivate::handleChannelFailure() throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR, "Unexpected SSH_MSG_CHANNEL_FAILURE packet."); } - emit initializationFailed(tr("Server could not start sftp subsystem.")); + emit initializationFailed(tr("Server could not start SFTP subsystem.")); closeChannel(); } From 701ecb7da8211cea25513fec281c496d3dece9ae Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:18:23 +0200 Subject: [PATCH 22/43] UI text: use sentence style capitalization for labels Change-Id: I80b8b74c07bc909e35d5e001bd65afd7d114a7c1 Reviewed-by: Erik Verbruggen --- src/plugins/texteditor/findinopenfiles.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index 2c7e942a793..979417f5d4f 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -89,7 +89,7 @@ QVariant FindInOpenFiles::additionalParameters() const QString FindInOpenFiles::label() const { - return tr("Open Documents:"); + return tr("Open documents:"); } QString FindInOpenFiles::toolTip() const From 43ec9e261f76208ee4a136bd87dac32c7be2ac12 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 1 Oct 2012 11:29:14 +0200 Subject: [PATCH 23/43] QmlDesigner: fix for QTime We have to call start() for QTime. Calling elapsed() without calling start before was never defined. Change-Id: I229b3cbb30a2b3e5e98fdb05736ee0f37ae42c38 Reviewed-by: Marco Bubke --- .../components/formeditor/formeditorscene.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 2f2ce94d2ed..a38fabe947f 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -270,9 +270,16 @@ void FormEditorScene::mousePressEvent(QGraphicsSceneMouseEvent *event) } } +static QTime staticTimer() +{ + QTime timer; + timer.start(); + return timer; +} + void FormEditorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - static QTime time; + static QTime time = staticTimer(); if (time.elapsed() > 30) { time.restart(); From 174226e21e338712f9fe195721c5156f0debb495 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:05:48 +0200 Subject: [PATCH 24/43] UI text: write Git in upper case Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7 Reviewed-by: Friedemann Kleint --- src/plugins/git/gerrit/gerritplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index c9fa258eb23..e935869d76c 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -387,7 +387,7 @@ QString GerritPlugin::gitBinary() bool ok; const QString git = Git::Internal::GitPlugin::instance()->gitClient()->gitBinaryPath(&ok); if (!ok) { - VcsBase::VcsBaseOutputWindow::instance()->appendError(tr("git is not available.")); + VcsBase::VcsBaseOutputWindow::instance()->appendError(tr("Git is not available.")); return QString(); } return git; From a791fee251dbed7fcd7cde276a34de457e197441 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 15:01:54 +0200 Subject: [PATCH 25/43] UI text: make zeroconf error message clearer Fix typo. Change-Id: Iee76e5f7a0c09d4e1d0f7c08a8c80f5bad9e5109 Reviewed-by: hjk --- src/libs/zeroconf/servicebrowser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp index fff6069df32..9a31075255d 100644 --- a/src/libs/zeroconf/servicebrowser.cpp +++ b/src/libs/zeroconf/servicebrowser.cpp @@ -1849,7 +1849,7 @@ void MainConnection::createConnection() if (m_nErrs > lib->maxErrors() || !lib->isOk()) { abortLib(); } else if (lib->tryStartDaemon(this)) { - appendError(ErrorMessage::WarningLevel, tr("Zeroconf using %1 daemon starting seem successful, continuing.") + appendError(ErrorMessage::WarningLevel, tr("Starting the Zeroconf daemon using %1 seems successful, continuing.") .arg(lib->name())); } else { appendError(ErrorMessage::WarningLevel, tr("Zeroconf using %1 failed because no daemon is running.") @@ -1863,7 +1863,7 @@ void MainConnection::createConnection() } } if (status() < Stopping) { - startupPhase(zeroConfLibInstance()->nFallbacksTot() + 3, tr("Succeded using %1.").arg(lib->name())); + startupPhase(zeroConfLibInstance()->nFallbacksTot() + 3, tr("Succeeded using %1.").arg(lib->name())); appendError(ErrorMessage::NoteLevel, tr("MainConnection could successfully create a connection using %1.") .arg(lib->name())); From e06582731e937511e9ff9c1867491d6b7e1ef5fc Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:14:11 +0200 Subject: [PATCH 26/43] UI text: fix capitalization for debugger strings Change-Id: If70418319529f75e893f3d5b60cb7dfa6a739dca Reviewed-by: hjk --- src/plugins/coreplugin/idocument.cpp | 2 +- src/plugins/debugger/gdb/gdbengine.cpp | 8 +++---- src/plugins/debugger/moduleshandler.cpp | 26 ++++++++++----------- src/plugins/debugger/sourcefileshandler.cpp | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 2d5e7d3e3c2..d79facc78c8 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -88,7 +88,7 @@ void IDocument::setRestoredFrom(const QString &name) m_restored = true; InfoBarEntry info(QLatin1String(kRestoredAutoSave), tr("File was restored from auto-saved copy. " - "Use Save to confirm, or Revert to Saved to discard changes.")); + "Select Save to confirm or Revert to Saved to discard changes.")); infoBar()->addInfo(info); } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 17c9ec349da..fec8fcf3199 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -220,7 +220,7 @@ public: QAction *createAction(QObject *parent) const { QAction *action = new QAction(DebuggerPlugin::tr("Install &Debug Information"), parent); - action->setToolTip(DebuggerPlugin::tr("This tries to install missing debug information.")); + action->setToolTip(DebuggerPlugin::tr("Tries to install missing debug information.")); return action; } @@ -301,7 +301,7 @@ QString GdbEngine::errorMessage(QProcess::ProcessError error) switch (error) { case QProcess::FailedToStart: return tr("The gdb process failed to start. Either the " - "invoked program '%1' is missing, or you may have insufficient " + "invoked program \"%1\" is missing, or you may have insufficient " "permissions to invoke the program.\n%2") .arg(m_gdb, gdbProc()->errorString()); case QProcess::Crashed: @@ -1052,7 +1052,7 @@ void GdbEngine::commandTimeout() "to a command within %n second(s). This could mean it is stuck " "in an endless loop or taking longer than expected to perform " "the operation.\nYou can choose between waiting " - "longer or abort debugging.", 0, timeOut / 1000); + "longer or aborting debugging.", 0, timeOut / 1000); QMessageBox *mb = showMessageBox(QMessageBox::Critical, tr("GDB not responding"), msg, QMessageBox::Ok | QMessageBox::Cancel); @@ -2094,7 +2094,7 @@ int GdbEngine::currentFrame() const static QString msgNoGdbBinaryForToolChain(const Abi &tc) { - return GdbEngine::tr("There is no gdb binary available for binaries in format '%1'") + return GdbEngine::tr("There is no GDB binary available for binaries in format '%1'") .arg(tc.toString()); } diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 645e944f2db..e251dbbf25b 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -80,12 +80,12 @@ QVariant ModulesModel::headerData(int section, { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { static QString headers[] = { - ModulesHandler::tr("Module name") + QLatin1String(" "), - ModulesHandler::tr("Module path") + QLatin1String(" "), - ModulesHandler::tr("Symbols read") + QLatin1String(" "), - ModulesHandler::tr("Symbols type") + QLatin1String(" "), - ModulesHandler::tr("Start address") + QLatin1String(" "), - ModulesHandler::tr("End address") + QLatin1String(" ") + ModulesHandler::tr("Module Name") + QLatin1String(" "), + ModulesHandler::tr("Module Path") + QLatin1String(" "), + ModulesHandler::tr("Symbols Read") + QLatin1String(" "), + ModulesHandler::tr("Symbols Type") + QLatin1String(" "), + ModulesHandler::tr("Start Address") + QLatin1String(" "), + ModulesHandler::tr("End Address") + QLatin1String(" ") }; return headers[section]; } @@ -123,22 +123,22 @@ QVariant ModulesModel::data(const QModelIndex &index, int role) const case 2: if (role == Qt::DisplayRole) switch (module.symbolsRead) { - case Module::UnknownReadState: return ModulesHandler::tr("unknown"); - case Module::ReadFailed: return ModulesHandler::tr("no"); - case Module::ReadOk: return ModulesHandler::tr("yes"); + case Module::UnknownReadState: return ModulesHandler::tr("Unknown"); + case Module::ReadFailed: return ModulesHandler::tr("No"); + case Module::ReadOk: return ModulesHandler::tr("Yes"); } break; case 3: if (role == Qt::DisplayRole) switch (module.elfData.symbolsType) { case UnknownSymbols: - return ModulesHandler::tr("unknown"); + return ModulesHandler::tr("Unknown"); case NoSymbols: - return ModulesHandler::tr("none"); + return ModulesHandler::tr("None"); case PlainSymbols: - return ModulesHandler::tr("plain"); + return ModulesHandler::tr("Plain"); case FastSymbols: - return ModulesHandler::tr("fast"); + return ModulesHandler::tr("Fast"); case LinkedSymbols: return ModulesHandler::tr("debuglnk"); case BuildIdSymbols: diff --git a/src/plugins/debugger/sourcefileshandler.cpp b/src/plugins/debugger/sourcefileshandler.cpp index 45f1c856e7f..ccabeb677ef 100644 --- a/src/plugins/debugger/sourcefileshandler.cpp +++ b/src/plugins/debugger/sourcefileshandler.cpp @@ -59,8 +59,8 @@ QVariant SourceFilesHandler::headerData(int section, { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { static QString headers[] = { - tr("Internal name") + QLatin1String(" "), - tr("Full name") + QLatin1String(" "), + tr("Internal Name") + QLatin1String(" "), + tr("Full Name") + QLatin1String(" "), }; return headers[section]; } From a17d7d7528a3c291f131fb6d33d70ae6d6e51e42 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 1 Oct 2012 10:11:34 +0200 Subject: [PATCH 27/43] UI text: fix capitalization Change-Id: I16419b21a7414c0e97238d33c433a88233076cf5 Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbaseeditor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 445bf48ac13..4afb3cb9541 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -510,8 +510,8 @@ void UrlTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type) { Q_UNUSED(type); menu->addSeparator(); - menu->addAction(createOpenUrlAction(tr("Open URL in browser..."))); - menu->addAction(createCopyUrlAction(tr("Copy URL location"))); + menu->addAction(createOpenUrlAction(tr("Open URL in Browser..."))); + menu->addAction(createCopyUrlAction(tr("Copy URL Location"))); } QString UrlTextCursorHandler::currentContents() const @@ -575,8 +575,8 @@ void EmailTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type { Q_UNUSED(type); menu->addSeparator(); - menu->addAction(createOpenUrlAction(tr("Send email to..."))); - menu->addAction(createCopyUrlAction(tr("Copy email address"))); + menu->addAction(createOpenUrlAction(tr("Send Email To..."))); + menu->addAction(createCopyUrlAction(tr("Copy Email Address"))); } void EmailTextCursorHandler::slotOpenUrl() From 599e4881c237e449ee0fa90ba3e1c783db7c56f6 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 28 Sep 2012 13:43:03 +0200 Subject: [PATCH 28/43] TypeHierarchy: Make type hierarchy independent of editor This makes it possible to close all editors and still have the typehierarchy visible. It used to close for no apparent reason. Change-Id: I4d1500b5402905c6a04623ea60247c9d746acab8 Reviewed-by: David Schulz --- src/plugins/cppeditor/cpptypehierarchy.cpp | 48 +++++++--------------- src/plugins/cppeditor/cpptypehierarchy.h | 5 --- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 88ca5f89287..d764cce1149 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -124,7 +124,6 @@ private: // CppTypeHierarchyWidget CppTypeHierarchyWidget::CppTypeHierarchyWidget(Core::IEditor *editor) : QWidget(0), - m_cppEditor(0), m_treeView(0), m_model(0), m_delegate(0) @@ -133,9 +132,7 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget(Core::IEditor *editor) : layout->setMargin(0); layout->setSpacing(0); - if (CPPEditor *cppEditor = qobject_cast(editor)) { - m_cppEditor = static_cast(cppEditor->widget()); - + if (qobject_cast(editor)) { m_inspectedClass = new CppClassLabel(this); m_inspectedClass->setMargin(5); layout->addWidget(m_inspectedClass); @@ -165,27 +162,18 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget(Core::IEditor *editor) : CppTypeHierarchyWidget::~CppTypeHierarchyWidget() {} -bool CppTypeHierarchyWidget::handleEditorChange(Core::IEditor *editor) -{ - if (CPPEditor *cppEditor = qobject_cast(editor)) { - if (m_cppEditor) { - m_cppEditor = static_cast(cppEditor->widget()); - return true; - } - } else if (!m_cppEditor) { - return true; - } - return false; -} - void CppTypeHierarchyWidget::perform() { - if (!m_cppEditor) + CPPEditor *editor = qobject_cast(Core::EditorManager::instance()->currentEditor()); + if (!editor) + return; + CPPEditorWidget *widget = qobject_cast(editor->widget()); + if (!widget) return; m_model->clear(); - CppElementEvaluator evaluator(m_cppEditor); + CppElementEvaluator evaluator(widget); evaluator.setLookupBaseClasses(true); evaluator.setLookupDerivedClasses(true); evaluator.execute(); @@ -218,7 +206,13 @@ void CppTypeHierarchyWidget::buildHierarchy(const CppClass &cppClass, QStandardI void CppTypeHierarchyWidget::onItemClicked(const QModelIndex &index) { - m_cppEditor->openLink(index.data(LinkRole).value()); + const TextEditor::BaseTextEditorWidget::Link link + = index.data(LinkRole).value(); + if (!link.fileName.isEmpty()) + TextEditor::BaseTextEditorWidget::openEditorAt(link.fileName, + link.line, + link.column, + Constants::CPPEDITOR_ID); } // CppTypeHierarchyStackedWidget @@ -227,9 +221,6 @@ CppTypeHierarchyStackedWidget::CppTypeHierarchyStackedWidget(QWidget *parent) : m_typeHiearchyWidgetInstance(new CppTypeHierarchyWidget(Core::EditorManager::currentEditor())) { addWidget(m_typeHiearchyWidgetInstance); - - connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), - this, SLOT(editorChanged(Core::IEditor*))); } CppTypeHierarchyStackedWidget::~CppTypeHierarchyStackedWidget() @@ -237,17 +228,6 @@ CppTypeHierarchyStackedWidget::~CppTypeHierarchyStackedWidget() delete m_typeHiearchyWidgetInstance; } -void CppTypeHierarchyStackedWidget::editorChanged(Core::IEditor *editor) -{ - if (!m_typeHiearchyWidgetInstance->handleEditorChange(editor)) { - CppTypeHierarchyWidget *replacement = new CppTypeHierarchyWidget(editor); - removeWidget(m_typeHiearchyWidgetInstance); - m_typeHiearchyWidgetInstance->deleteLater(); - m_typeHiearchyWidgetInstance = replacement; - addWidget(m_typeHiearchyWidgetInstance); - } -} - // CppTypeHierarchyFactory CppTypeHierarchyFactory::CppTypeHierarchyFactory() {} diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index 2d862d69044..23acb0e3e5f 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -69,8 +69,6 @@ public: CppTypeHierarchyWidget(Core::IEditor *editor); virtual ~CppTypeHierarchyWidget(); - bool handleEditorChange(Core::IEditor *editor); - public slots: void perform(); @@ -97,9 +95,6 @@ public: CppTypeHierarchyStackedWidget(QWidget *parent = 0); virtual ~CppTypeHierarchyStackedWidget(); -public slots: - void editorChanged(Core::IEditor* editor); - private: CppTypeHierarchyWidget *m_typeHiearchyWidgetInstance; }; From 2de2af5ee0e0b484d29f58d8f2821260f6edbb1a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 1 Oct 2012 15:26:13 +0200 Subject: [PATCH 29/43] tr()-fixes for 2.6. Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55 Reviewed-by: Leena Miettinen Reviewed-by: Tobias Hunger --- src/libs/ssh/sshconnection.cpp | 4 ++-- src/plugins/qtsupport/qtoptionspage.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 7d748d02677..a78a5505252 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -357,8 +357,8 @@ void SshConnectionPrivate::handleServerId() if (newLinePos > 255 - 1) { throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, "Identification string too long.", - tr("Server identification string is %1 characters long, but the maximum " - "allowed length is 255.").arg(newLinePos + 1)); + tr("Server identification string is %n characters long, but the maximum " + "allowed length is 255.", 0, newLinePos + 1)); } const bool hasCarriageReturn = m_incomingData.at(newLinePos - 1) == '\r'; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 17ba2f8ab16..895743fa66f 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -636,7 +636,7 @@ void QtOptionsPageWidget::addQtDir() { Utils::FileName qtVersion = Utils::FileName::fromString( QFileInfo(QFileDialog::getOpenFileName(this, - tr("Select a qmake executable"), + tr("Select a qmake Executable"), QString(), filterForQmakeFileDialog(), 0, @@ -646,7 +646,7 @@ void QtOptionsPageWidget::addQtDir() BaseQtVersion *version = QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion); if (version) { // Already exist - QMessageBox::warning(this, tr("Qt known"), + QMessageBox::warning(this, tr("Qt Version Already Registered"), tr("This Qt version was already registered as \"%1\".") .arg(version->displayName())); return; From c5e0f9cfbdf2fee02d66c7dfff0a4d4977c2afe0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 12 Sep 2012 11:40:50 +0200 Subject: [PATCH 30/43] Prevent modal dialogs from locking up in Qt 5. When choosing "Manage kits" from the wizard, the settings dialog locks up when using Qt 5 since 2 modal dialogs execute on the mainwindow. Task-number: QTBUG-27206 Change-Id: I69b756fed48983ec7217452b2f6c3049a520f1c3 Reviewed-by: Oliver Wolff Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp | 3 ++- src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp index a393cf8df09..903f3655409 100644 --- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp @@ -230,7 +230,8 @@ void Qt4TargetSetupWidget::manageKit() page->showKit(m_kit); Core::ICore::showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY), - QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID)); + QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID), + this); } void Qt4TargetSetupWidget::setProFilePath(const QString &proFilePath) diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index 350030eccb5..d8d5abb3b90 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -614,7 +614,8 @@ void TargetSetupPage::updateVisibility() void TargetSetupPage::openOptions() { Core::ICore::instance()->showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY), - QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID)); + QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID), + this); } void TargetSetupPage::removeWidget(ProjectExplorer::Kit *k) From 319e425e658be914dc6601c1244c83d57e90e814 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 1 Oct 2012 16:49:47 +0200 Subject: [PATCH 31/43] Small string fix Change-Id: I06fadcc2643b16a59adb962f134c259aa3991c39 Reviewed-by: Leena Miettinen --- src/plugins/bineditor/bineditorplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index ce28543c221..fc75eff62ba 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -224,7 +224,7 @@ public: QFile file(fileName); quint64 size = static_cast(file.size()); if (size == 0) { - QString msg = tr("The Binary Editor can not open empty files."); + QString msg = tr("The Binary Editor cannot open empty files."); if (errorString) *errorString = msg; else From 59f8c87659af7477623c54bb6128c43d2418eba5 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Mon, 1 Oct 2012 17:13:21 +0200 Subject: [PATCH 32/43] QmlInspector: Fetch data when needed Fetch data on demand for 4.x. Since, parentIds are not known, the tree will be reset when new objects are created. Related changes in Qt side: https://codereview.qt-project.org/#change,35982 Task-number: QTCREATORBUG-7779 Change-Id: I8b53604979bbbc2e6f01bc7b785929811a76f398 Reviewed-by: Christiaan Janssen --- .../debugger/qml/qmlinspectoragent.cpp | 56 +++++++++++-------- src/plugins/debugger/qml/qmlinspectoragent.h | 4 +- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 21734dbd9a1..314aae360f3 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -98,6 +98,17 @@ void QmlInspectorAgent::assignValue(const WatchData *data, } } +int parentIdForIname(const QByteArray &iname) +{ + // Extract the parent id + int lastIndex = iname.lastIndexOf('.'); + int secondLastIndex = iname.lastIndexOf('.', lastIndex - 1); + int parentId = -1; + if (secondLastIndex != -1) + parentId = iname.mid(secondLastIndex + 1, lastIndex - secondLastIndex - 1).toInt(); + return parentId; +} + void QmlInspectorAgent::updateWatchData(const WatchData &data) { if (debug) @@ -105,6 +116,15 @@ void QmlInspectorAgent::updateWatchData(const WatchData &data) if (data.id && !m_fetchDataIds.contains(data.id)) { // objects + using namespace QmlDebug::Constants; + if (m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { + int parentId = parentIdForIname(data.iname); + if (parentId != -1) { + QList childIds = m_debugIdChildIds.value(parentId); + childIds << data.id; + m_debugIdChildIds.insert(parentId, childIds); + } + } m_fetchDataIds << data.id; fetchObject(data.id); } @@ -441,10 +461,10 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value, foreach (QVariant var, objList) { // TODO: check which among the list is the actual // object that needs to be selected. - objectTreeFetched(qvariant_cast(var)); + insertObjectInTree(qvariant_cast(var)); } } else { - objectTreeFetched(qvariant_cast(value)); + insertObjectInTree(qvariant_cast(value)); } } else if (queryId == m_engineQueryId) { m_engineQueryId = 0; @@ -456,7 +476,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value, } else if (queryId == m_rootContextQueryId) { m_rootContextQueryId = 0; clearObjectTree(); - fetchObjectsInContextRecursive(qvariant_cast(value)); + updateObjectTree(qvariant_cast(value)); } else { emit expressionResult(queryId, value); } @@ -584,8 +604,7 @@ void QmlInspectorAgent::fetchContextObjectsForLocation(const QString &file, m_objectTreeQueryIds << queryId; } -// fetch the root objects from the context + any child contexts -void QmlInspectorAgent::fetchObjectsInContextRecursive(const ContextReference &context) +void QmlInspectorAgent::updateObjectTree(const ContextReference &context) { if (debug) qDebug() << __FUNCTION__ << '(' << context << ')'; @@ -594,22 +613,14 @@ void QmlInspectorAgent::fetchObjectsInContextRecursive(const ContextReference &c || !debuggerCore()->boolSetting(ShowQmlObjectTree)) return; - foreach (const ObjectReference & obj, context.objects()) { - using namespace QmlDebug::Constants; - // qt <= 4.8.3 - if (m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { - m_objectTreeQueryIds << m_engineClient->queryObjectRecursive(obj.debugId()); - } else { - // Fetch only root objects for qt > 4.8.3 - if (obj.parentId() == -1) - fetchObject(obj.debugId()); - } - } + foreach (const ObjectReference & obj, context.objects()) + insertObjectInTree(obj); + foreach (const ContextReference &child, context.contexts()) - fetchObjectsInContextRecursive(child); + updateObjectTree(child); } -void QmlInspectorAgent::objectTreeFetched(const ObjectReference &object) +void QmlInspectorAgent::insertObjectInTree(const ObjectReference &object) { if (debug) qDebug() << __FUNCTION__ << '(' << object << ')'; @@ -737,8 +748,9 @@ void QmlInspectorAgent::buildDebugIdHashRecursive(const ObjectReference &ref) m_debugIdLocations.insert(ref.debugId(), FileReference(filePath, lineNum, colNum)); // qt <= 4.8.3 - if (m_newObjectsCreated && m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { - QList childIds; + if (m_newObjectsCreated + && m_engineClient->objectName() == QLatin1String(QDECLARATIVE_ENGINE)) { + QList childIds = m_debugIdChildIds.value(ref.debugId()); foreach (const ObjectReference &c, ref.children()) { childIds << c.debugId(); } @@ -868,10 +880,10 @@ bool QmlInspectorAgent::isConnected() const void QmlInspectorAgent::clearObjectTree() { // clear view - m_debuggerEngine->watchHandler()->removeChildren("inspect"); + m_debuggerEngine->watchHandler()->cleanup(); m_objectTreeQueryIds.clear(); - + m_fetchDataIds.clear(); int old_count = m_debugIdHash.count(); m_debugIdHash.clear(); m_debugIdHash.reserve(old_count + 1); diff --git a/src/plugins/debugger/qml/qmlinspectoragent.h b/src/plugins/debugger/qml/qmlinspectoragent.h index 2d4ad81aefb..a289483e797 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.h +++ b/src/plugins/debugger/qml/qmlinspectoragent.h @@ -110,9 +110,9 @@ private slots: void onValueChanged(int debugId, const QByteArray &propertyName, const QVariant &value); private: - void fetchObjectsInContextRecursive(const QmlDebug::ContextReference &context); + void updateObjectTree(const QmlDebug::ContextReference &context); - void objectTreeFetched(const QmlDebug::ObjectReference &result); + void insertObjectInTree(const QmlDebug::ObjectReference &result); void buildDebugIdHashRecursive(const QmlDebug::ObjectReference &ref); QList buildWatchData(const QmlDebug::ObjectReference &obj, From 30b553466797ddf7e3252f1cab2d02d6ea0bee5a Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Tue, 18 Sep 2012 22:12:07 +0200 Subject: [PATCH 33/43] Fix "Apply function signature change" for boost::shared_ptr Problem was with nested template type(in this case shared_ptr is nested template type) Task-number: QTCREATORBUG-6784 Change-Id: I8ea9203f2b1fbde73d9ac4e6c8cdeb2b6e0afcef Reviewed-by: David Schulz --- src/libs/cplusplus/CppRewriter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp index 31eefe8deef..8f8da60218e 100644 --- a/src/libs/cplusplus/CppRewriter.cpp +++ b/src/libs/cplusplus/CppRewriter.cpp @@ -395,7 +395,8 @@ FullySpecifiedType UseMinimalNames::apply(const Name *name, Rewrite *rewrite) co SubstitutionEnvironment *env = rewrite->env; Scope *scope = env->scope(); - if (name->isTemplateNameId()) + if (name->isTemplateNameId() || + (name->isQualifiedNameId() && name->asQualifiedNameId()->name()->isTemplateNameId())) return FullySpecifiedType(); if (! scope) From dff0761406c89ece9a562bbac02323a886ed3e34 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 27 Sep 2012 10:20:43 +0200 Subject: [PATCH 34/43] Device support: Ensure UI changes are always propagated to the device. The original problem was that we cannot assume QLineEdit::editingFinished() is emitted when clicking a button while a QLineEdit has the focus (QTCREATORBUG-1675). The original solution to that introduced two more bugs, namely that changes are not visible in other tabs until the dialog has been closed and reopened and that pressing "Apply" also applies changes that are done later and which the user intends to revert by by pressing "Cancel" (QTCREATORBUG-7288). This patch intends to fix all of these issues. Task-number: QTCREATORBUG-1675 Task-number: QTCREATORBUG-7288 Change-Id: I569a89f64843e08ee389e3eba6bdcb473ba22393 Reviewed-by: Tobias Hunger --- .../devicesupport/devicesettingswidget.cpp | 19 +++++++++++-------- .../devicesupport/devicesettingswidget.h | 2 +- .../devicesupport/idevicewidget.h | 12 ++++++++++++ .../blackberrydeviceconfigurationwidget.cpp | 8 ++++++++ .../qnx/blackberrydeviceconfigurationwidget.h | 1 + .../genericlinuxdeviceconfigurationwidget.cpp | 11 +++++++++++ .../genericlinuxdeviceconfigurationwidget.h | 1 + 7 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index 1d26187b7cc..30d67bd30b5 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -102,7 +102,6 @@ DeviceSettingsWidget::DeviceSettingsWidget(QWidget *parent) m_deviceManager(DeviceManager::cloneInstance()), m_deviceManagerModel(new DeviceManagerModel(m_deviceManager, this)), m_nameValidator(new NameValidator(m_deviceManager, this)), - m_saveSettingsRequested(false), m_additionalActionsMapper(new QSignalMapper(this)), m_configWidget(0) { @@ -115,11 +114,6 @@ DeviceSettingsWidget::DeviceSettingsWidget(QWidget *parent) DeviceSettingsWidget::~DeviceSettingsWidget() { - if (m_saveSettingsRequested) { - Core::ICore::settings()->setValue(QLatin1String(LastDeviceIndexKey), - currentIndex()); - DeviceManager::replaceInstance(); - } DeviceManager::removeClonedInstance(); delete m_configWidget; delete m_ui; @@ -237,10 +231,17 @@ void DeviceSettingsWidget::fillInValues() m_ui->nameLineEdit->setText(current->displayName()); } +void DeviceSettingsWidget::updateDeviceFromUi() +{ + deviceNameEditingFinished(); + if (m_configWidget) + m_configWidget->updateDeviceFromUi(); +} + void DeviceSettingsWidget::saveSettings() { - // We must defer this step because of a stupid bug on MacOS. See QTCREATORBUG-1675. - m_saveSettingsRequested = true; + Core::ICore::settings()->setValue(QLatin1String(LastDeviceIndexKey), currentIndex()); + DeviceManager::replaceInstance(); } int DeviceSettingsWidget::currentIndex() const @@ -329,12 +330,14 @@ void DeviceSettingsWidget::handleAdditionalActionRequest(int actionId) { const IDevice::ConstPtr device = m_deviceManager->find(currentDevice()->id()); QTC_ASSERT(device, return); + updateDeviceFromUi(); device->executeAction(Core::Id::fromUniqueIdentifier(actionId), this); } void DeviceSettingsWidget::handleProcessListRequested() { QTC_ASSERT(currentDevice()->canCreateProcessModel(), return); + updateDeviceFromUi(); DeviceProcessesDialog dlg; dlg.addCloseButton(); dlg.setDevice(currentDevice()); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index 177315a959f..64a8491e3df 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -81,12 +81,12 @@ private: void clearDetails(); QString parseTestOutput(); void fillInValues(); + void updateDeviceFromUi(); Ui::DeviceSettingsWidget *m_ui; DeviceManager * const m_deviceManager; DeviceManagerModel * const m_deviceManagerModel; NameValidator * const m_nameValidator; - bool m_saveSettingsRequested; QList m_additionalActionButtons; QSignalMapper * const m_additionalActionsMapper; IDeviceWidget *m_configWidget; diff --git a/src/plugins/projectexplorer/devicesupport/idevicewidget.h b/src/plugins/projectexplorer/devicesupport/idevicewidget.h index 0b7ccf363c0..5b212efa7ca 100644 --- a/src/plugins/projectexplorer/devicesupport/idevicewidget.h +++ b/src/plugins/projectexplorer/devicesupport/idevicewidget.h @@ -50,6 +50,18 @@ namespace ProjectExplorer { class PROJECTEXPLORER_EXPORT IDeviceWidget : public QWidget { Q_OBJECT +public: + + /*! + * \brief Ensures that all changes in the UI are propagated to the device object. + * + * If the device is always updated right when the change happens, the implementation of + * this function can be empty. Note, however, that you cannot generally rely on the + * QLineEdit::editingFinished() signal being emitted on time if some button in the dialog is + * clicked (e.g. "Apply"). So if you have any handlers for line edit changes, they should + * probably be called here. + */ + virtual void updateDeviceFromUi() = 0; protected: IDeviceWidget(const IDevice::Ptr &device, QWidget *parent = 0) diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp index c4d94d90237..0cc62a6a69e 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp @@ -93,6 +93,14 @@ void BlackBerryDeviceConfigurationWidget::debugTokenEditingFinished() deviceConfiguration()->setDebugToken(ui->debugToken->path()); } +void BlackBerryDeviceConfigurationWidget::updateDeviceFromUi() +{ + hostNameEditingFinished(); + passwordEditingFinished(); + keyFileEditingFinished(); + debugTokenEditingFinished(); +} + void BlackBerryDeviceConfigurationWidget::initGui() { ui->debugToken->setExpectedKind(Utils::PathChooser::File); diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h index 299ec4cc9c0..fb8b207dcc3 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h +++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h @@ -62,6 +62,7 @@ private slots: void debugTokenEditingFinished(); private: + void updateDeviceFromUi(); void initGui(); BlackBerryDeviceConfiguration::Ptr deviceConfiguration() const; diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp index b2d87407c2b..343c19a8d43 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp @@ -151,6 +151,17 @@ void GenericLinuxDeviceConfigurationWidget::createNewKey() setPrivateKey(dialog.privateKeyFilePath()); } +void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi() +{ + hostNameEditingFinished(); + sshPortEditingFinished(); + timeoutEditingFinished(); + userNameEditingFinished(); + passwordEditingFinished(); + keyFileEditingFinished(); + handleFreePortsChanged(); +} + void GenericLinuxDeviceConfigurationWidget::updatePortsWarningLabel() { m_ui->portsWarningLabel->setVisible(!device()->freePorts().hasMore()); diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h index 0b996fb1e92..3a0d2f12296 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h @@ -64,6 +64,7 @@ private slots: void createNewKey(); private: + void updateDeviceFromUi(); void updatePortsWarningLabel(); void initGui(); From 37a95617f23bf6bcb2ed61ac192d3f2b40827b49 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 26 Sep 2012 09:46:44 +0200 Subject: [PATCH 35/43] Editor: Fix resizing of proposal widged Stop resizing width on scrolling the proposal widget via drag of the scrollbar. Task-number: QTCREATORBUG-7925 Change-Id: I948a0ec1bba8a9294b8a65b5eaa72063bbede48f Reviewed-by: Christian Stenger --- .../codeassist/genericproposalwidget.cpp | 20 +++++++++++++++++++ .../codeassist/genericproposalwidget.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 7d5b63b35ed..3de6546253c 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -250,6 +250,7 @@ public: QPointer m_infoFrame; QTimer m_infoTimer; CodeAssistant *m_assistant; + bool m_autoWidth; public slots: void handleActivation(const QModelIndex &modelIndex); @@ -264,6 +265,7 @@ GenericProposalWidgetPrivate::GenericProposalWidgetPrivate(QWidget *completionWi , m_explicitlySelected(false) , m_justInvoked(false) , m_assistant(0) + , m_autoWidth(true) { connect(m_completionListView, SIGNAL(activated(QModelIndex)), this, SLOT(handleActivation(QModelIndex))); @@ -328,6 +330,10 @@ GenericProposalWidget::GenericProposalWidget() d->m_completionListView->setMinimumSize(1, 1); connect(d->m_completionListView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updatePositionAndSize())); + connect(d->m_completionListView->verticalScrollBar(), SIGNAL(sliderPressed()), + this, SLOT(turnOffAutoWidth())); + connect(d->m_completionListView->verticalScrollBar(), SIGNAL(sliderReleased()), + this, SLOT(turnOnAutoWidth())); QVBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); @@ -492,6 +498,9 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix) void GenericProposalWidget::updatePositionAndSize() { + if (!d->m_autoWidth) + return; + const QSize &shint = d->m_completionListView->calculateSize(); const int fw = frameWidth(); const int width = shint.width() + fw * 2 + 30; @@ -514,6 +523,17 @@ void GenericProposalWidget::updatePositionAndSize() setGeometry(pos.x(), pos.y(), width, height); } +void GenericProposalWidget::turnOffAutoWidth() +{ + d->m_autoWidth = false; +} + +void GenericProposalWidget::turnOnAutoWidth() +{ + d->m_autoWidth = true; + updatePositionAndSize(); +} + bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::FocusOut) { diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h index 745f7d51bce..77a1688ef3f 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.h +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h @@ -65,6 +65,8 @@ private: private slots: void updatePositionAndSize(); + void turnOffAutoWidth(); + void turnOnAutoWidth(); protected: virtual bool eventFilter(QObject *o, QEvent *e); From 4df4d1c0c4aa61d0177c44c4f62cb3f19328bbb9 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 1 Oct 2012 17:01:25 +0200 Subject: [PATCH 36/43] Squish: Added test for automatic conversion from "." to "->" Change-Id: Ib1cd24818b691fc4ccd43b60ff4afdd4e0394fde Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 ++ tests/system/suite_editors/suite.conf | 12 +++++++++ .../suite_editors/tst_memberoperator/test.py | 26 +++++++++++++++++++ .../tst_memberoperator/testdata/usages.tsv | 23 ++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tests/system/suite_editors/suite.conf create mode 100644 tests/system/suite_editors/tst_memberoperator/test.py create mode 100644 tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv diff --git a/tests/system/objects.map b/tests/system/objects.map index ce30f1bdafd..98896e6c4f8 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -105,6 +105,8 @@ :QtSupport__Internal__QtVersionManager.QLabel {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' type='QLabel' unnamed='1' visible='1'} :QtSupport__Internal__QtVersionManager.qmake_QLabel {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' name='qmakePath' type='QLabel' visible='1'} :QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget {container=':qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget' name='qtdirList' type='QTreeWidget' visible='1'} +:Revert to Saved.Proceed_QPushButton {text='Proceed' type='QPushButton' unnamed='1' visible='1' window=':Revert to Saved_QMessageBox'} +:Revert to Saved_QMessageBox {text?='You will lose your current changes if you proceed reverting*' type='QMessageBox' unnamed='1' visible='1'} :Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'} :Symbol Server_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Symbol Server'} :addToVersionControlComboBox_QComboBox {name='addToVersionControlComboBox' type='QComboBox' visible='1'} diff --git a/tests/system/suite_editors/suite.conf b/tests/system/suite_editors/suite.conf new file mode 100644 index 00000000000..717453e22dc --- /dev/null +++ b/tests/system/suite_editors/suite.conf @@ -0,0 +1,12 @@ +AUT=qtcreator +CLASS= +CLASSPATH= +CWD= +ENVVARS=envvars +HOOK_SUB_PROCESSES=false +IMPLICITAUTSTART=0 +LANGUAGE=Python +OBJECTMAP=../objects.map +TEST_CASES=tst_memberoperator +VERSION=2 +WRAPPERS=Qt diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py new file mode 100644 index 00000000000..7e329ba900f --- /dev/null +++ b/tests/system/suite_editors/tst_memberoperator/test.py @@ -0,0 +1,26 @@ +source("../../shared/qtcreator.py") + +def main(): + startApplication("qtcreator" + SettingsPath) + createProject_Qt_Console(tempDir(), "SquishProject") + selectFromLocator("main.cpp") + cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") + + for record in testData.dataset("usages.tsv"): + include = testData.field(record, "include") + if include: + placeCursorToLine(cppwindow, "#include ") + typeLines(cppwindow, ("", "#include " + include)) + placeCursorToLine(cppwindow, "return a.exec();") + typeLines(cppwindow, ("", testData.field(record, "declaration"))) + type(cppwindow, testData.field(record, "usage")) + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", + "sourceFilesRefreshed(QStringList)") + type(cppwindow, testData.field(record, "operator")) + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", + "sourceFilesRefreshed(QStringList)") + test.compare(str(lineUnderCursor(cppwindow)).strip(), testData.field(record, "expected")) + invokeMenuItem("File", 'Revert "main.cpp" to Saved') + clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton")) + + invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv b/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv new file mode 100644 index 00000000000..a1e21767bf0 --- /dev/null +++ b/tests/system/suite_editors/tst_memberoperator/testdata/usages.tsv @@ -0,0 +1,23 @@ +"include" "declaration" "usage" "operator" "expected" +"" "" "syntaxError" "." "syntaxError." +"" "" "argc" "." "argc." +"" "" "argv[0]" "." "argv[0]." +"" "QCoreApplication qa;" "qa" "." "qa." +"" "QCoreApplication *p;" "p" "." "p->" +"" "QCoreApplication &ref = a;" "ref" "." "ref." +"" "QPointer p;" "p" "." "p." +"" "QPointer *poi;" "poi" "." "poi->" +"" "QPointer &poi;" "poi" "." "poi." +"" "QPointer poi[5];" "poi[2]" "." "poi[2]." +"" "QPointer *poi[5];" "poi[2]" "." "poi[2]->" +"" "std::auto_ptr sap;" "sap" "." "sap." +"" "std::auto_ptr *sap;" "sap" "." "sap->" +"" "std::auto_ptr &sap;" "sap" "." "sap." +"" "std::auto_ptr sap[10];" "sap[2]" "." "sap[2]." +"" "std::auto_ptr *sap[10];" "sap[2]" "." "sap[2]->" +"" "QVector vec;" "vec" "." "vec." +"" "QVector vec;" "vec" "." "vec." +"" "QVector *vec;" "vec" "." "vec->" +"" "QVector *vec;" "vec" "." "vec->" +"" "QVector vec;" "vec[0]" "." "vec[0]." +"" "QVector vec;" "vec[0]" "." "vec[0]->" From 8dc234c17130d254d21159e9561e6697416861da Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 1 Oct 2012 15:29:12 +0200 Subject: [PATCH 37/43] German translation for 2.6. Change-Id: I8cbb07c76c730cf40d6099b3cd26ebc82923931c Reviewed-by: Christian Stenger Reviewed-by: Robert Loehning --- share/qtcreator/translations/qtcreator_de.ts | 498 +++++++++++-------- 1 file changed, 295 insertions(+), 203 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 8f4b74be113..91a1e313f35 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -7416,10 +7416,6 @@ Fehler: %2 Run Ausführen - - No executable - Keine ausführbare Datei - ProjectExplorer::Internal::ProcessStep @@ -12253,10 +12249,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.There are no changes to commit. Es sind keine ausstehenden Änderungen vorhanden. - - Unable to generate a temporary file for the commit editor. - Es konnte keine temporäre Datei für die Abgabe angelegt werden. - Unable to create an editor for the commit. Es konnte kein Editor für die Abgabe angelegt werden. @@ -13279,6 +13271,14 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.File '%1' does not exist or is not readable. Die Datei '%1' existiert nicht oder ist nicht lesbar. + + Device type is not desktop. + Der Gerätetyp ist nicht "Desktop". + + + No Qt version set in kit. + Im Kit ist keine Qt-Version gesetzt. + QmlProjectManager::Internal::QmlProjectApplicationWizardDialog @@ -13570,6 +13570,10 @@ Erfordert <b>Qt 4.7.4</b> oder neuer. Evaluating Auswertung + + No Qt version set in kit. + Im Kit ist keine Qt-Version gesetzt. + The .pro file '%1' does not exist. Die .pro-Datei '%1' existiert nicht. @@ -18813,10 +18817,6 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.There are no changes to commit. Es sind keine ausstehenden Änderungen vorhanden. - - Unable to generate a temporary file for the commit editor. - Es konnte keine temporäre Datei für die Abgabe angelegt werden. - Unable to create an editor for the commit. Es konnte kein Editor für die Abgabe angelegt werden. @@ -19730,6 +19730,10 @@ Fehler: %2 Kit Selection Kit-Auswahl + + %1 - temporary + %1 - temporär + Qt Creator can use the following kits for project <b>%1</b>: %1: Project name @@ -20245,7 +20249,7 @@ Bei vollständiger Cache-Simulation werden weitere Ereigniszähler aktiviert: Globale Bus-Ereignisse aufnehmen - Visualisation: Minimum event cost: + Visualization: Minimum event cost: Minimale Ereigniskosten für Visualisierung: @@ -21327,10 +21331,22 @@ Bitte verwenden Sie den Stop-Button. Debugging Helper Build Log for '%1' Erstellungsprotokoll der Ausgabe-Hilfsbibliothek für '%1' + + Select a qmake Executable + Wählen Sie die ausführbare qmake-Datei aus + + + Qt Version Already Registered + Qt-Version bereits registriert + Select a qmake executable Wählen Sie die ausführbare qmake-Datei aus + + This Qt version was already registered as "%1". + Diese Qt-Version ist bereits unter "%1" registriert. + Helpers: None available Hilfskomponenten: Keine verfügbar @@ -26030,11 +26046,11 @@ should a repository require SSH-authentication (see documentation on SSH and the IDE-Überblick - To find out what kind of integrated enviroment (IDE) Qt Creator is. + To find out what kind of integrated environment (IDE) Qt Creator is. Um herauszufinden, um welche Art von integrierter Entwicklungsumgebung es sich bei Qt Creator handelt. - To become familar with the parts of the Qt Creator user interface and to learn how to use them. + To become familiar with the parts of the Qt Creator user interface and to learn how to use them. Um sich mit den Teilen der Benutzeroberfläche von Qt Creator vertraut zu machen und ihre Bedienung zu erlernen. @@ -26815,8 +26831,8 @@ Möchten Sie es beenden? QmlProfiler::Internal::QmlProfilerEventsWidget - Trace information from the v8 JavaScript engine. Available only in Qt5 based applications - Trace-Information vom v8 JavaScript-Engine. Nur in Qt-5 basierten Anwendungen verfügbar + Trace information from the v8 JavaScript engine. Available only in Qt5 based applications. + Trace-Information vom v8 JavaScript-Engine. Nur in Qt-5 basierten Anwendungen verfügbar. Copy Row @@ -26898,13 +26914,13 @@ Möchten Sie es beenden? Das Binding wird von der optimierten Engine ausgewertet. - Binding not optimized (eg. has side effects or assignments, + Binding not optimized (e.g. has side effects or assignments, references to elements in other files, loops, etc.) Das Binding ist nicht optimiert (d.h., es hat Seiteneffekte oder Zuweisungen, Referenzen zu Elementen in anderen Dateien, Schleifen, etc.) - Binding loop detected - Endlosschleife bei Binding festgestellt + Binding loop detected. + Endlosschleife bei Binding festgestellt. µs @@ -26942,8 +26958,8 @@ references to elements in other files, loops, etc.) QmlProfiler::Internal::QmlProfilerEventsParentsAndChildrenView - Part of binding loop - Teil der Binding-Endlosschleife + Part of binding loop. + Teil der Binding-Schleife. Callee @@ -27035,28 +27051,28 @@ references to elements in other files, loops, etc.) AvahiZConfLib c konnte die native Bibliothek '%1' nicht laden: %2 - %1 could not create a client (probably the daemon is not running) - %1 konnte keinen Client erzeugen (möglicherweise läuft kein Hintergrundprozess) + %1 cannot create a client. The daemon is probably not running. + %1 konnte keinen Client erzeugen (möglicherweise läuft kein Hintergrundprozess). - cAvahiClient, server collision - cAvahiClient, Server-Kollision + cAvahiClient, server collision. + cAvahiClient, Server-Kollision. - cAvahiClient, some kind of error happened on the client side - cAvahiClient, client-seitiger Fehler + cAvahiClient, an error occurred on the client side. + cAvahiClient, client-seitiger Fehler. - cAvahiClient, still connecting, no server available - cAvahiClient, versuche Verbindung herzustellen, es ist kein Server verfügbar + cAvahiClient, still connecting, no server available. + cAvahiClient, versuche Verbindung herzustellen, es ist kein Server verfügbar. - unexpected state %1 in cAvahiClientReply - unerwarteter Status %1 in cAvahiClientReply + Unexpected state %1 in cAvahiClientReply. + Unerwarteter Status %1 in cAvahiClientReply. - unexpected state %1 in cAvahiBrowseReply - unerwarteter Status %1 in cAvahiBrowseReply + Unexpected state %1 in cAvahiBrowseReply. + Unerwarteter Status %1 in cAvahiBrowseReply. %1 failed to kill other daemons with '%2'. @@ -27168,8 +27184,8 @@ references to elements in other files, loops, etc.) Debugger::Internal::QmlV8DebuggerClient - anonymous function - anonyme Funktion + Anonymous Function + Anonyme Funktion @@ -27179,7 +27195,7 @@ references to elements in other files, loops, etc.) Offene Dokumente - Open Documents: + Open documents: Offene Dokumente: @@ -27422,6 +27438,10 @@ references to elements in other files, loops, etc.) BinEditorDocument + + The Binary Editor can not open empty files. + Der Binäreditor kann keine leeren Dateien öffnen. + Cannot open %1: %2 Die Datei %1 kann nicht geöffnet werden: %2 @@ -27687,25 +27707,25 @@ references to elements in other files, loops, etc.) Name der privaten Schlüsseldatei auswählen - Failure To Save Key File - Fehler beim Speichern der Schlüsseldatei + Cannot Save Key File + Schlüsseldatei kann nicht gespeichert werden + + + Cannot Save Private Key File + Die private Schlüsseldatei kann nicht gespeichert werden + + + Cannot Save Public Key File + Öffentliche Schlüsseldatei kann nicht gespeichert werden Failed to create directory: '%1'. Der Ordner '%1' konnte nicht erstellt werden. - - Saving Private Key File failed - Das Speichern des privaten Schlüssels schlug fehl - The private key file could not be saved: %1 Die private Schlüsseldatei konnte nicht gespeichert werden: %1 - - Saving Public Key File failed - Das Speichern des öffentlichen Schlüssels schlug fehl - The public key file could not be saved: %1 Die öffentliche Schlüsseldatei konnte nicht gespeichert werden: %1 @@ -27788,14 +27808,6 @@ references to elements in other files, loops, etc.) Organization (e.g. KDE): Organisation (z.B. KDE): - - City or Locality: - Stadt: - - - State or Province: - Staat oder Provinz: - Two-letter country code for this unit (e.g. RO): Länderkennung für die Einheit (2 Buchstaben, z.B. RO): @@ -27812,6 +27824,14 @@ references to elements in other files, loops, etc.) Certificate Distinguished Names Namen des Zertifikats + + City or locality: + Stadt: + + + State or province: + Bundesland oder Provinz: + AndroidDeployStepWidget @@ -27819,18 +27839,6 @@ references to elements in other files, loops, etc.) Form Form - - Edit rules file - Regeldatei bearbeiten - - - Choose apk - Apk wählen - - - Install Ministro system wide Qt shared libraries installer - Installiere Ministro system wide Qt shared libraries installer - Choose and install Ministro system wide Qt shared libraries. This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator). @@ -27859,6 +27867,18 @@ Sie müssen für die Plattform kompiliert vorliegen Use local Qt libraries Lokale Qt-Bibliotheken ausliefern + + Edit Rules File + Regeldatei bearbeiten + + + Install Ministro, system-wide Qt shared libraries installer + Installiere Ministro (systemweiter Installer für Qt shared libraries) + + + Choose APK + APK wählen + AndroidPackageCreationWidget @@ -28022,30 +28042,14 @@ Sie müssen für die Plattform kompiliert vorliegen Android NDK location: Android-NDK: - - Android NDK toolchain version: - Toolchain-Version des Android NDK: - Ant location: ant: - - arm GDB location: - arm GDB: - - - arm GDBserver location: - arm GDBserver: - x86 GDB location: x86 GDB: - - x86 GDBserver location: - x86 GDBserver: - OpenJDK location: OpenJDK: @@ -28078,6 +28082,22 @@ Sie müssen für die Plattform kompiliert vorliegen Remove Entfernen + + Android NDK tool chain version: + Toolchain-Version des Android NDK: + + + ARM GDB location: + ARM GDB: + + + ARM GDB server location: + ARM GDB-Server: + + + x86 GDB server location: + x86 GDB-Server: + Core::RemoveFileDialog @@ -28403,8 +28423,8 @@ Sie müssen für die Plattform kompiliert vorliegen QSsh::Internal::SftpChannelPrivate - Server could not start sftp subsystem. - Der Server konnte das sftp-Subsystem nicht starten. + Server could not start SFTP subsystem. + Der Server konnte das SFTP-Subsystem nicht starten. Unexpected packet of type %1. @@ -28523,13 +28543,32 @@ Sie müssen für die Plattform kompiliert vorliegen Botan library exception: %1 Ausnahmefehler in der Botan-Bibliothek: %1 - - Invalid protocol version: Expected '2.0', got '%1'. - Die Versionen des Protokolls stimmen nicht überein: Erwartet '2.0', erhalten %1. + + Server identification string is %n characters long, but the maximum allowed length is 255. + + Die Zeichenkette zur Identifikation des Servers ist ein Zeichen lang, die maximal zulässige Länge ist aber 255. + Die Zeichenkette zur Identifikation des Servers ist %n Zeichen lang, die maximal zulässige Länge ist aber 255. + - Invalid server id '%1'. - Ungültige Server-Kennzeichnung '%1'. + Server identification string contains illegal NUL character. + Die Zeichenkette zur Identifikation des Servers enthält ein unzulässiges NUL-Zeichen. + + + Server Identification string '%1' is invalid. + Die Zeichenkette '%1' zur Identifikation des Servers ist ungültig. + + + Server protocol version is '%1', but needs to be 2.0 or 1.99. + Die Version des Serverprotokolls ist '%1', erforderlich ist jedoch 2.0 oder 1.99. + + + Server identification string is invalid (missing carriage return). + Die Zeichenkette zur Identifikation des Servers ist ungültig (es fehlt der Zeilenvorschub). + + + Server reports protocol version 1.99, but sends data before the identification string, which is not allowed. + Der Server gibt Protokollversion 1.99 an, sendet aber Daten vor der Zeichenkette zur Identifikation, was nicht gestattet ist. Unexpected packet of type %1. @@ -28631,7 +28670,7 @@ Sie müssen für die Plattform kompiliert vorliegen Fehler beim Erstellen von AVD - Cannot create a new AVD, no sufficiently recent Android SDK available. + Cannot create a new AVD. No sufficiently recent Android SDK available. Please install an SDK of at least API version %1. Es konnte kein AVD erzeugt werden, da kein hinreichend aktuelles Android-SDK verfügbar ist. Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer. @@ -28720,13 +28759,21 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Exit code: %1 Rückgabewert: %1 + + Deploy Qt libraries. This may take some time, please wait. + Das Deployment der Qt-Bibliotheken kann einige Zeit dauern, bitte warten Sie. + Qt Android smart installer installation failed Die Installation des Qt-Android-Smart-Installers schlug fehl - Package installation failed - Die Installation des Pakets schlug fehl + Package installation failed. + Die Installation des Pakets schlug fehl. + + + Pulling files necessary for debugging. + Die für das Debuggen erforderlichen Dateien werden installiert. Installing package onto %1. @@ -28736,19 +28783,11 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Clean old Qt libraries Alte Qt-Bibliotheken bereinigen - - Deploy Qt libraries ... this may take some time, please wait - Das Deployment der Qt-Bibliotheken kann einige Zeit dauern, bitte warten Sie - - - Pulling files necessary for debugging - Die für das Debuggen erforderlichen Dateien werden installiert - Android::Internal::AndroidDeployStepFactory - Deploy to Android device/emulator + Deploy to Android device or emulator Deployment auf Android-Gerät oder Emulator @@ -28925,8 +28964,12 @@ Bitte wählen Sie einen gültigen Paketnamen für Ihre Anwendung (z.B. "org Wählen Sie ein Symbol für hohe DPI-Werte aus - png images (*.png) - png-Dateien (*.png) + PNG images (*.png) + PNG-Dateien (*.png) + + + < Type or choose a permission > + < Geben Sie eine Berechtigung ein oder wählen Sie eine aus > Choose Medium DPI Icon @@ -28936,10 +28979,6 @@ Bitte wählen Sie einen gültigen Paketnamen für Ihre Anwendung (z.B. "org Choose Low DPI Icon Wählen Sie ein Symbol für geringe DPI-Werte aus - - < type or choose a permission > - < Geben Sie eine Berechtigung ein oder wählen Sie eine aus > - <b>Package configurations</b> <b>Paket-Konfigurationen</b> @@ -28970,15 +29009,15 @@ Bitte wählen Sie einen gültigen Paketnamen für Ihre Anwendung (z.B. "org Android::Internal::AndroidRunControl - Starting remote process... - Starte entfernten Prozess... + Starting remote process. + Starte entfernten Prozess. Android::Internal::AndroidRunControlFactory - Run on Android device/emulator - Ausführung auf Android-Gerät oder Emulator + Run on Android device or emulator. + Ausführung auf Android-Gerät oder Emulator. @@ -28986,46 +29025,46 @@ Bitte wählen Sie einen gültigen Paketnamen für Ihre Anwendung (z.B. "org -'%1' died +'%1' died. -'%1' beendet +'%1' beendet. - Failed to forward C++ debugging ports. Reason: %1 - Die C++-Debuggerports konnten nicht übermittelt werden. Grund: %1 + Failed to forward C++ debugging ports. Reason: %1. + Die C++-Debuggerports konnten nicht übermittelt werden. Grund: %1. - Failed to forward C++ debugging ports - C++-Debuggerports konnten nicht übermittelt werden + Failed to forward C++ debugging ports. + C++-Debuggerports konnten nicht übermittelt werden. - Failed to forward QML debugging ports. Reason: %1 - Die QML-Debuggerports konnten nicht übermittelt werden. Grund: %1 + Failed to forward QML debugging ports. Reason: %1. + Die QML-Debuggerports konnten nicht übermittelt werden. Grund: %1. - Failed to forward QML debugging ports - QML-Debuggerports konnten nicht übermittelt werden + Failed to forward QML debugging ports. + QML-Debuggerports konnten nicht übermittelt werden. - Failed to start the activity. Reason: %1 - Die Aktivität konnte nicht gestartet werden: Grund: %1 + Failed to start the activity. Reason: %1. + Die Aktivität konnte nicht gestartet werden: Grund: %1. - Unable to start '%1' - '%1' konnte nicht gestartet werden + Unable to start '%1'. + '%1' konnte nicht gestartet werden. - Cannot find %1 process - Der Prozess '%1' konnte nicht gefunden werden + Cannot find %1 process. + Der Prozess %1 konnte nicht gefunden werden. -'%1' killed +'%1' killed. -'%1' abgebrochen +'%1' abgebrochen. @@ -29042,12 +29081,12 @@ Bitte wählen Sie einen gültigen Paketnamen für Ihre Anwendung (z.B. "org Android-SDK-Ordner - "%1" doesn't seem to be an Android SDK top folder - "%1" ist offenbar kein Android-SDK-Ordner + "%1" does not seem to be an Android SDK top folder. + "%1" ist offenbar kein Android-SDK-Ordner. - "%1" doesn't seem to be an Android NDK top folder - "%1" ist offenbar kein Android-NDK-Ordner + "%1" does not seem to be an Android NDK top folder. + "%1" ist offenbar kein Android-NDK-Ordner. Select Android SDK folder @@ -29469,40 +29508,40 @@ Einzelschritt in den Modul und das Setzen von Haltepunkten nach Datei und Zeilen Fehler: (%1) %2 - disconnected. + Disconnected. - getrennt. + Getrennt. - resolving host... - Hostname wird aufgelöst... + Resolving host. + Hostname wird aufgelöst. - connecting to debug server... - Verbinde zum Debug-Server... + Connecting to debug server. + Verbinde zum Debug-Server. - connected. + Connected. - verbunden. + Verbunden. - closing... - schließe Verbindung... + Closing. + Schließe Verbindung. Debugger::Internal::QmlInspectorAgent - success : - Erfolg : + Success: + Erfolg: - properties + Properties Eigenschaften @@ -30063,8 +30102,8 @@ nicht konfiguriert ist. Gerrit... - git is not available. - git ist nicht verfügbar. + Git is not available. + Git ist nicht verfügbar. Enter Local Repository for '%1' (%2) @@ -30243,7 +30282,7 @@ Möchten Sie sie zum Projekt hinzufügen?</html> Der Typ des Geräts, auf dem die Anwendung laufen soll. - Device Type: + Device type: Gerätetyp: @@ -30746,8 +30785,16 @@ Soll es noch einmal versucht werden? QtSupport::CustomExecutableRunConfiguration - Could not find the executable, please specify one. - Es konnte keine ausführbare Datei gefunden werden; bitte geben Sie eine an. + No executable. + Keine ausführbare Datei. + + + The executable +%1 +cannot be found in the path. + Die ausführbare Datei +%1 +konnte nicht im Pfad gefunden werden. Clean Environment @@ -30914,8 +30961,8 @@ Soll es noch einmal versucht werden? Android::Internal::AndroidQtVersion - Failed to detect the ABI(s) used by the Qt version. - Es konnten keine ABI(s)für diese Qt-Version bestimmt werden. + Failed to detect the ABIs used by the Qt version. + Die von der Qt-Version verwendeten ABIs konnten nicht bestimmt werden. Android @@ -31224,10 +31271,6 @@ Fehlerausgabe: %1 Check Out Check Out - - &Checkout Comment: - &Checkout-Kommentar: - &Reserved &Reserviert @@ -31245,6 +31288,10 @@ Fehlerausgabe: %1 Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit. Datei &hijacked verwenden + + &Checkout comment: + &Checkout-Kommentar: + ClearCase::Internal::SettingsPage @@ -31351,15 +31398,6 @@ Fehlerausgabe: %1 &Loaded Version Ge&ladene Version - - Created By: - Erstellt von: - - - Created On: - Date - Erstellt am: - Version after &update Version nach &Aktualisierung @@ -31368,6 +31406,15 @@ Fehlerausgabe: %1 <html><head/><body><p><b>NOTE: You will not be able to check in this file without merging the changes (not supported by the plugin)</b></p></body></html> <html><head/><body><p><b>Hinweis: Diese Datei kann nicht ohne Mergen der Änderungen eingecheckt werden (durch das Plugin nicht unterstützt)</b></p></body></html> + + Created by: + Erstellt von: + + + Created on: + Date + Erstellt am: + Android::Internal::AvdModel @@ -31388,7 +31435,7 @@ Fehlerausgabe: %1 ClearCase::Internal::ActivitySelector - Select &Activity: + Select &activity: Aktivität &auswählen: @@ -31629,10 +31676,26 @@ Fehlerausgabe: %1 File is already checked out. Die Datei ist bereits ausgecheckt. + + ClearCase Add File %1 + ClearCase Datei %1 hinzufügen + + + ClearCase Remove Element %1 + ClearCase Element %1 entfernen + This operation is irreversible. Are you sure? Dieser Vorgang kann nicht rückgängig gemacht werden. Sind Sie sicher? + + ClearCase Remove File %1 + ClearCase Datei %1 löschen + + + ClearCase Rename File %1 -> %2 + ClearCase Datei %1 -> %2 umbenennen + Do you want to undo hijack of '%1'? Möchten Sie den Hijack von "%1" rückgängig machen? @@ -31669,22 +31732,6 @@ Fehlerausgabe: %1 Enter &comment: &Kommentar eingeben: - - ClearCase Add File - ClearCase Datei hinzufügen - - - ClearCase Remove Element - ClearCase Element entfernen - - - ClearCase Remove File - ClearCase Datei löschen - - - ClearCase Rename File - ClearCase Datei umbenennen - Activity Headline Titel der Aktivität @@ -31747,7 +31794,7 @@ Fehlerausgabe: %1 Server port: - + Server-Port: Select Working Directory @@ -31996,27 +32043,26 @@ Fehlerausgabe: %1 Debugger::Internal::DebuggerKitConfigWidget + + Manage... + Verwalten... + The debugger to use for this kit. Der für dieses Kit zu verwendende Debugger. - <html><body><p>Specify the path to the <a href="%1">Windows Console Debugger executable</a> (%2) here.</p></body></html> - Label text for path configuration. %2 is "x-bit version". - <html><body><p>Geben Sie den Pfad zu der ausführbaren Datei des <a href="%1">Windows Console Debuggers</a> (%2) an.</p></body></html> - - - 64-bit version - 64-bit-Version - - - 32-bit version - 32-bit-Version - - - Auto detect + Auto-detect Automatisch bestimmen + + Edit... + Bearbeiten... + + + Debugger for "%1" + Debugger für "%1" + Debugger: Debugger: @@ -32041,8 +32087,12 @@ Fehlerausgabe: %1 Der Pfad zum Debugger muss als absoluter Pfad angegeben werden (%1). - %1 using '%2' - %1 unter Verwendung von '%2' + %1 <None> + %1 <keine> + + + %1 using "%2" + %1 unter Verwendung von "%2" Debugger @@ -32187,8 +32237,12 @@ Fehlerausgabe: %1 ProjectExplorer::Internal::KitManagerConfigWidget - Kits - Kits + Name: + Name: + + + Kit name and icon. + Kit-Name und Symbol. Select Icon @@ -32314,4 +32368,42 @@ Fehlerausgabe: %1 Keine + + Debugger::Internal::DebuggerKitConfigDialog + + &Engine: + &Engine: + + + &Binary: + &Ausführbare Datei: + + + 64-bit version + 64-bit-Version + + + 32-bit version + 32-bit-Version + + + <html><body><p>Specify the path to the <a href="%1">Windows Console Debugger executable</a> (%2) here.</p></body></html> + Label text for path configuration. %2 is "x-bit version". + <html><body><p>Geben Sie den Pfad zu der ausführbaren Datei des <a href="%1">Windows Console Debuggers</a> (%2) an.</p></body></html> + + + + ProjectExplorer::RunConfiguration + + Unknown error. + Unbekannter Fehler. + + + + CustomExecutableDialog + + Could not find the executable, please specify one. + Es konnte keine ausführbare Datei gefunden werden; bitte geben Sie eine an. + + From fbb756cdcc3976a3afb8ffec5477b19ec77914c9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Sun, 30 Sep 2012 23:19:53 +0200 Subject: [PATCH 38/43] Fix crashes when cyclic inheritance Task-number: QTCREATORBUG-7933 Change-Id: I98469a092ff3ff0acc69800e9aade4ebb268332a Reviewed-by: Erik Verbruggen --- src/libs/cplusplus/LookupContext.cpp | 15 ++- src/libs/cplusplus/LookupContext.h | 30 +++++ src/plugins/cpptools/cppcompletion_test.cpp | 120 ++++++++++++++++++++ src/plugins/cpptools/cpptoolsplugin.h | 2 + 4 files changed, 166 insertions(+), 1 deletion(-) diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index e474287d199..3e675644075 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -708,11 +708,22 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac if (!referenceClass) return reference; + const TemplateNameId *templId = name->asTemplateNameId(); + if (_alreadyConsideredClasses.contains(referenceClass) || + (templId && + _alreadyConsideredTemplates.contains(templId))) { + return reference; + } + + if (!name->isTemplateNameId()) + _alreadyConsideredClasses.insert(referenceClass); + QSet knownUsings = reference->usings().toSet(); // If we are dealling with a template type, more work is required, since we need to // construct all instantiation data. - if (const TemplateNameId *templId = name->asTemplateNameId()) { + if (templId) { + _alreadyConsideredTemplates.insert(templId); ClassOrNamespace *instantiation = _factory->allocClassOrNamespace(reference); instantiation->_templateId = templId; instantiation->_instantiationOrigin = origin; @@ -786,6 +797,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac } } + _alreadyConsideredTemplates.clear(templId); return instantiation; } @@ -828,6 +840,7 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac } } + _alreadyConsideredClasses.clear(referenceClass); return reference; } diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index fef317fd614..6db8b1187de 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -45,6 +45,33 @@ namespace CPlusPlus { class CreateBindings; +class Class; +template +class AlreadyConsideredClassContainer +{ +public: + AlreadyConsideredClassContainer() : _class(0) {} + void insert(const T *item) + { + if (_container.isEmpty()) + _class = item; + _container.insert(item); + } + bool contains(const T *item) + { + return _container.contains(item); + } + + void clear(const T *item) + { + if (_class != item) + _container.clear(); + } + +private: + QSet _container; + const T * _class; +}; class CPLUSPLUS_EXPORT ClassOrNamespace { @@ -112,6 +139,9 @@ private: const TemplateNameId *_templateId; ClassOrNamespace *_instantiationOrigin; + AlreadyConsideredClassContainer _alreadyConsideredClasses; + AlreadyConsideredClassContainer _alreadyConsideredTemplates; + friend class CreateBindings; }; diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 08e14bd67a6..8f0b5ecbe3b 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -672,3 +672,123 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat completions.clear(); } + + +void CppToolsPlugin::test_completion_cyclic_inheritance() +{ + test_completion(); +} + +void CppToolsPlugin::test_completion_cyclic_inheritance_data() +{ + QTest::addColumn("code"); + QTest::addColumn("expectedCompletions"); + + QByteArray code; + QStringList completions; + + code = "\n" + "struct B;\n" + "struct A : B { int _a; };\n" + "struct B : A { int _b; };\n" + "\n" + "A c;\n" + "@\n" + ; + completions.append("A"); + completions.append("_a"); + completions.append("B"); + completions.append("_b"); + QTest::newRow("case: direct cyclic inheritance") << code << completions; + + completions.clear(); + code = "\n" + "struct C;\n" + "struct A : C { int _a; };\n" + "struct B : A { int _b; };\n" + "struct C : B { int _c; };\n" + "\n" + "A c;\n" + "@\n" + ; + completions.append("A"); + completions.append("_a"); + completions.append("B"); + completions.append("_b"); + completions.append("C"); + completions.append("_c"); + QTest::newRow("case: indirect cyclic inheritance") << code << completions; + + completions.clear(); + code = "\n" + "struct B;\n" + "struct A : B { int _a; };\n" + "struct C { int _c; };\n" + "struct B : C, A { int _b; };\n" + "\n" + "A c;\n" + "@\n" + ; + completions.append("A"); + completions.append("_a"); + completions.append("B"); + completions.append("_b"); + completions.append("C"); + completions.append("_c"); + QTest::newRow("case: indirect cyclic inheritance") << code << completions; + + completions.clear(); + code = "\n" + "template< typename T > struct C;\n" + "template< typename T, typename S > struct D : C< S >\n" + "{\n" + " T _d_t;\n" + " S _d_s;\n" + "};\n" + "template< typename T > struct C : D< T, int >\n" + "{\n" + " T _c_t;\n" + "};\n" + "\n" + "D c;\n" + "@\n" + ; + completions.append("D"); + completions.append("_d_t"); + completions.append("_d_s"); + completions.append("C"); + completions.append("_c_t"); + QTest::newRow("case: direct cyclic inheritance with templates") + << code << completions; + + completions.clear(); + code = "\n" + "template< typename T > struct C;\n" + "template< typename T, typename S > struct D : C< S >\n" + "{\n" + " T _d_t;\n" + " S _d_s;\n" + "};\n" + "template< typename T > struct B : D< T, int >\n" + "{\n" + " T _b_t;\n" + "};\n" + "template< typename T > struct C : B\n" + "{\n" + " T _c_t;\n" + "};\n" + "\n" + "D c;\n" + "@\n" + ; + completions.append("D"); + completions.append("_d_t"); + completions.append("_d_s"); + completions.append("C"); + completions.append("_c_t"); + completions.append("B"); + completions.append("_b_t"); + QTest::newRow("case: indirect cyclic inheritance with templates") + << code << completions; + +} diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 554a1877832..d84319db03b 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -100,6 +100,8 @@ private slots: void test_completion_use_global_identifier_as_base_class_data(); void test_completion_base_class_has_name_the_same_as_derived(); void test_completion_base_class_has_name_the_same_as_derived_data(); + void test_completion_cyclic_inheritance(); + void test_completion_cyclic_inheritance_data(); private: void test_completion(); From 0d17f2402436f959e97be7449aed396342706567 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Oct 2012 12:33:02 +0200 Subject: [PATCH 39/43] Fix isDirty detection of tool chain config widget Change-Id: I17046315b286dd4c224f7465da0ec981941c77d5 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/kitinformationconfigwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index da8903581fd..372463376f4 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -165,7 +165,7 @@ bool ToolChainInformationConfigWidget::isDirty() const { ToolChain *tc = ToolChainKitInformation::toolChain(m_kit); return (m_comboBox->itemData(m_comboBox->currentIndex()).toString()) - == (tc ? tc->id() : QString()); + != (tc ? tc->id() : QString()); } void ToolChainInformationConfigWidget::makeReadOnly() From c450eea96f9bc2974298edd8cdcb741fbd669dbf Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Oct 2012 12:34:00 +0200 Subject: [PATCH 40/43] Make kit config tidy again Do allow kit config to become "tidy" again after a change made it dirty. Change-Id: I764093c2ce199633d8f67bea0e4747d6b0bfd2b7 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/kitmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index 9e79e4b2ef1..cbfc9996958 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -266,7 +266,7 @@ void KitModel::setDirty() KitConfigWidget *w = qobject_cast(sender()); foreach (KitNode *n, m_manualRoot->childNodes) { if (n->widget == w) { - n->changed = true; + n->changed = n->widget->isDirty(); emit dataChanged(index(n, 0), index(n, columnCount(QModelIndex()))); } } From 3d1d0a3e0aa35afca1cb46b73006af8f34045ed1 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Oct 2012 12:34:37 +0200 Subject: [PATCH 41/43] Do not loose device settings in Kits when adding a new device Change-Id: I1947726b67c5f9474b0052c25ea8dca494f4c6b4 Reviewed-by: Daniel Teske --- .../projectexplorer/kitinformationconfigwidget.cpp | 13 +++++++++++++ .../projectexplorer/kitinformationconfigwidget.h | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index 372463376f4..7fdfb5cf671 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -308,6 +308,9 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *k, QWidget *pa m_comboBox(new QComboBox), m_manageButton(new QPushButton(this)), m_model(new DeviceManagerModel(DeviceManager::instance())) { + connect(m_model, SIGNAL(modelAboutToBeReset()), SLOT(modelAboutToReset())); + connect(m_model, SIGNAL(modelReset()), SLOT(modelReset())); + setToolTip(tr("The device to run the applications on.")); QHBoxLayout *layout = new QHBoxLayout(this); @@ -368,5 +371,15 @@ void DeviceInformationConfigWidget::manageDevices() QLatin1String(ProjectExplorer::Constants::DEVICE_SETTINGS_PAGE_ID)); } +void DeviceInformationConfigWidget::modelAboutToReset() +{ + m_selectedId = m_model->deviceId(m_comboBox->currentIndex()); +} + +void DeviceInformationConfigWidget::modelReset() +{ + m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId)); +} + } // namespace Internal } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index f338b9be4cc..632ce87ba59 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -33,6 +33,8 @@ #include "kitconfigwidget.h" +#include + QT_BEGIN_NAMESPACE class QComboBox; class QPushButton; @@ -148,6 +150,8 @@ public: private slots: void manageDevices(); + void modelAboutToReset(); + void modelReset(); private: bool m_isReadOnly; @@ -155,6 +159,7 @@ private: QComboBox *m_comboBox; QPushButton *m_manageButton; DeviceManagerModel *m_model; + Core::Id m_selectedId; }; } // namespace Internal From 945fb79e4b54f5e4d55e3c947e6be3cd5f09e7e2 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 3 Oct 2012 07:33:44 +0200 Subject: [PATCH 42/43] GDB build: Remove symbian target Change-Id: Id15d42d9447221be85baff92d08823d3fff4c3da Reviewed-by: David Schulz --- dist/gdb/Makefile.linux | 2 +- dist/gdb/Makefile.mingw | 2 +- dist/gdb/Makefile.osx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux index bebd2a05429..1c7d6da33bc 100644 --- a/dist/gdb/Makefile.linux +++ b/dist/gdb/Makefile.linux @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf +targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi staging=${broot}/staging pyversion=2.7 expatversion=2.0.1 diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw index 354610a1051..e8e0f80563a 100644 --- a/dist/gdb/Makefile.mingw +++ b/dist/gdb/Makefile.mingw @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=arm-none-symbianelf arm-none-linux-gnueabi i686-pc-mingw32 +targets=arm-none-linux-gnueabi i686-pc-mingw32 staging=${broot}/staging pyversion=2.7 pydir=${broot}/python diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx index 4060b166f84..6b03bf6b293 100644 --- a/dist/gdb/Makefile.osx +++ b/dist/gdb/Makefile.osx @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf +targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi staging=${broot}/staging pyversion=2.7 expatversion=2.0.1 From ed86a7ca5860b7e48fd7de2a63f3983f37667c4b Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 27 Sep 2012 15:40:34 +0200 Subject: [PATCH 43/43] Get rid of some Q_WS_X11. This macro isn't defined in Qt5 anymore, so use Q_OS_* where appropriate. Regarding bug QTCREATORBUG-7936: Now the fonts look normal again on GNU/Linux, e.g. in the text editor and the application/compile output pane. Task-number: QTCREATORBUG-7936 Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059 Reviewed-by: Eike Ziller --- src/app/main.cpp | 2 +- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/debugger/debuggertooltipmanager.cpp | 2 -- src/plugins/debugger/stackwindow.cpp | 2 -- src/plugins/debugger/watchwindow.cpp | 2 -- src/plugins/qmlprofiler/qmlprofilereventview.cpp | 4 ---- src/plugins/texteditor/fontsettings.cpp | 4 +--- 7 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 526ca15477f..42d63559f7c 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -218,7 +218,7 @@ int main(int argc, char **argv) setrlimit(RLIMIT_NOFILE, &rl); #endif -#ifdef Q_WS_X11 +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) // QML is unusable with the xlib backend QApplication::setGraphicsSystem("raster"); #endif diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index afc34b6ea0e..d8420a3e055 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -186,7 +186,7 @@ MainWindow::MainWindow() : QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); QString baseName = QApplication::style()->objectName(); -#ifdef Q_WS_X11 +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) if (baseName == QLatin1String("windows")) { // Sometimes we get the standard windows 95 style as a fallback // e.g. if we are running on a KDE4 desktop diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index d6c956250ed..7b03136e479 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -691,9 +691,7 @@ void DebuggerToolTipWidget::copy() { const QString clipboardText = clipboardContents(); QClipboard *clipboard = QApplication::clipboard(); -#ifdef Q_WS_X11 clipboard->setText(clipboardText, QClipboard::Selection); -#endif clipboard->setText(clipboardText, QClipboard::Clipboard); } diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp index 2d6958f4dd6..3a2962ddf4b 100644 --- a/src/plugins/debugger/stackwindow.cpp +++ b/src/plugins/debugger/stackwindow.cpp @@ -225,9 +225,7 @@ void StackTreeView::copyContentsToClipboard() str += QLatin1Char('\n'); } QClipboard *clipboard = QApplication::clipboard(); -# ifdef Q_WS_X11 clipboard->setText(str, QClipboard::Selection); -# endif clipboard->setText(str, QClipboard::Clipboard); } diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index 96d9fc3ecec..45cb435b60b 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -600,9 +600,7 @@ static QString removeWatchActionText(QString exp) static void copyToClipboard(const QString &clipboardText) { QClipboard *clipboard = QApplication::clipboard(); -#ifdef Q_WS_X11 clipboard->setText(clipboardText, QClipboard::Selection); -#endif clipboard->setText(clipboardText, QClipboard::Clipboard); } diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp index 5b88f1551e0..33d0d14c979 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp @@ -921,9 +921,7 @@ void QmlProfilerEventsMainView::copyTableToClipboard() const str += d->textForItem(d->m_model->item(i)); } QClipboard *clipboard = QApplication::clipboard(); -# ifdef Q_WS_X11 clipboard->setText(str, QClipboard::Selection); -# endif clipboard->setText(str, QClipboard::Clipboard); } @@ -933,9 +931,7 @@ void QmlProfilerEventsMainView::copyRowToClipboard() const str = d->textForItem(d->m_model->itemFromIndex(selectedItem()), false); QClipboard *clipboard = QApplication::clipboard(); -# ifdef Q_WS_X11 clipboard->setText(str, QClipboard::Selection); -# endif clipboard->setText(str, QClipboard::Clipboard); } diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index 219fab2a8be..ada0f6fcaf7 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -55,15 +55,13 @@ static const bool DEFAULT_ANTIALIAS = true; #ifdef Q_OS_MAC enum { DEFAULT_FONT_SIZE = 12 }; static const char *DEFAULT_FONT_FAMILY = "Monaco"; -#else -#ifdef Q_WS_X11 +#elif defined(Q_OS_UNIX) enum { DEFAULT_FONT_SIZE = 9 }; static const char *DEFAULT_FONT_FAMILY = "Monospace"; #else enum { DEFAULT_FONT_SIZE = 10 }; static const char *DEFAULT_FONT_FAMILY = "Courier"; #endif -#endif } // anonymous namespace namespace TextEditor {