summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared/profileevaluator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-031-3/+3
| | | | Task-number: QTBUG-8044
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
| | | | | | | | | | | | | | The second and third arguments to qmake's include function are optional Task-number: 259398 Reviewed-by: Stian Sandvik Thomassen
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | nicer way to deal with missing support for template class friendsOswald Buddenhagen2009-08-061-2/+0
| |
* | sunpro doesn't like templated friend classes, eitherOswald Buddenhagen2009-07-211-1/+1
| |
* | Fix static leak to make valgrinding easier.dt2009-07-201-63/+61
| | | | | | | | | | | | Reviewed-By: ossi cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator
* | micro-optimize: (x.toLower() == y) => !x.compare(y, Qt:: CaseInsensitive)Oswald Buddenhagen2009-07-201-10/+10
| | | | | | | | cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator
* | fix return value of error() & coOswald Buddenhagen2009-07-201-1/+2
| | | | | | | | cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
* | make message() & co. handling more qmake-likeOswald Buddenhagen2009-07-201-14/+1
| | | | | | | | | | | | which basically means cutting features. heh cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator
* | expand arguments to s// operatorOswald Buddenhagen2009-07-201-1/+1
| | | | | | | | cherry-picked e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 from creator
* | support loops: implement for(), next() & break()Oswald Buddenhagen2009-07-201-2/+120
| | | | | | | | cherry-picked 88de3e6a45a41baecb7e56e7cbab7fec30ac0a1c from creator
* | implement if() testOswald Buddenhagen2009-07-201-1/+81
| | | | | | | | cherry-picked d89338aa810861c636278be4a5bb5d8b23ce99b8 from creator
* | implement {greater,less}Than(), equals(), clear() & unset()Oswald Buddenhagen2009-07-201-5/+53
| | | | | | | | cherry-picked dbdbe92d5d66cbd466bcc0aea532ce79a034ab84 from creator
* | support custom functions: implement defineTest(), defineReplace(), ↵Oswald Buddenhagen2009-07-201-68/+225
| | | | | | | | | | | | | | defined(), return() & export() cherry-picked d077ba29c34782d1699693b6e3f07c2037eecdba and 93571f7d42a81a8236ceac1f745ef277f194f1ca from creator
* | remove return values from the visitors which need noneOswald Buddenhagen2009-07-201-24/+16
| | | | | | | | cherry-picked 6ca93b31fd95ef7cce78a5e0d5225e50d6007f2f from creator
* | surround file inclusion with saving/restoring condition stateOswald Buddenhagen2009-07-201-1/+4
| | | | | | | | cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator
* | fix conditionals, in particular the nested else handlingOswald Buddenhagen2009-07-201-31/+27
| | | | | | | | | | | | | | | | this also removes the optimization to skip test function calls which appear to be part of a failed test, as this could skip includes, etc. as well. cherry-picked ed00bd2c85cbf2c1bea63dc18d0ae7084b4fb65f from creator
* | fix m_invertNext effect scopingOswald Buddenhagen2009-07-201-2/+4
| | | | | | | | | | | | | | an evaluation function can be an include statement. the included code must neither inherit nor change the current inversion state. cherry-picked 68b1b828e6030b4fe26ca9ffc4ee7a0b4bfe8f4e from creator
* | put condition state variables into a structureOswald Buddenhagen2009-07-201-23/+29
| | | | | | | | | | | | | | to enable cleaner save/restore - for later cherry-picked 51f5ee959f58ee198e0fc51e2ad0161c612bf8d1 and 3104e4c121f3209890823db69a7c09d644b90951 from creator
* | return value cleanupOswald Buddenhagen2009-07-201-97/+61
| | | | | | | | | | | | | | | | functions which have essentially two return values are kinda confusing. so represent file & parse errors as false in the regular evaluation result (like qmake effectively does). cherry-picked cee3ca324e6979d6c476001cafb452a286f09a69 from creator
* | ifdef cleanupOswald Buddenhagen2009-07-201-1/+1
| | | | | | | | cherry-picked from d2a8449bea58275723e769cd41c085468cb56295 from creator
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-131-162/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp src/3rdparty/webkit/WebCore/generated/CSSGrammar.h src/3rdparty/webkit/WebCore/generated/Grammar.cpp src/3rdparty/webkit/WebCore/generated/Grammar.h src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp src/3rdparty/webkit/WebCore/generated/XPathGrammar.h src/3rdparty/webkit/WebKit/qt/ChangeLog tools/linguist/lrelease/main.cpp tools/linguist/lupdate/main.cpp tools/linguist/shared/profileevaluator.cpp
| * implement proper vpath handlingOswald Buddenhagen2009-07-131-102/+53
| | | | | | | | | | | | | | | | | | | | | | | | this also removes the bogus special casing of various filename-containing variables inside the pro parser. while this is a feature as such, it restores backwards compatibility without damaging the correct behavior again, so it qualifies for 4.5. based on a2f40fce2a1cf3c19a13fa27eea08192493ab76e from creator Task-number: 254098
| * factor out linguist-specific partOswald Buddenhagen2009-07-131-60/+0
| | | | | | | | it is simpler to keep it in sync with creator then.
* | Merge commit 'origin/4.5'Bill King2009-07-131-11/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
| * Fix memory leak in $$system() calls from .pro filesOswald Buddenhagen2009-07-101-0/+4
| | | | | | | | cherry-picked 07730341bd739aac823ac9b4336d8294510a35e2 from creator
| * remove totally pointless conditionalOswald Buddenhagen2009-07-101-1/+1
| | | | | | | | cherry-picked 167a09b20614d282ec898f69fc2a3f0bafa11229 from creator
| * remove dead codeOswald Buddenhagen2009-07-101-10/+0
| | | | | | | | cherry-picked d8b1cc5f0ecbb8de734d241d72a05b325c2bbb2c from creator
* | tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-2/+2
| | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | improved string operations all over the placeThierry Bastian2009-05-281-2/+2
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
| |
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-151-1/+10
|\ \ | |/
| * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | Task-number: 250574
| * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| |
* | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-4/+10
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| |
| * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
* | Merge branch '4.5'Thiago Macieira2009-03-271-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * whitespaceOswald Buddenhagen2009-03-271-2/+2
| |
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1785
|