summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* configure -dont-process must build the host tools on Windows CEJoerg Bornemann2009-07-212-2/+2
| | | | Reviewed-by: mauricek
* sunpro doesn't like templated friend classes, eitherOswald Buddenhagen2009-07-212-2/+2
|
* 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-204-4/+149
| | | | 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-204-110/+283
| | | | | | | defined(), return() & export() cherry-picked d077ba29c34782d1699693b6e3f07c2037eecdba and 93571f7d42a81a8236ceac1f745ef277f194f1ca from creator
* remove return values from the visitors which need noneOswald Buddenhagen2009-07-203-38/+36
| | | | 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-202-23/+32
| | | | | | | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOswald Buddenhagen2009-07-201-9/+13
|\
| * doc: Print warning where \reimp is used where \internal should be used.Martin Smith2009-07-201-9/+13
| | | | | | | | e.g. '\reimp' in myFunc() should be '\internal' because its base function is private or internal
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-2012-40/+78
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * Fix assert in message handling.Frans Englich2009-07-201-3/+9
| | | | | | | | | | | | | | Trivial fix. Reported by Michael Brasser. Task-number: 258337 Reviewed-By: Peter Hartmann
| * don't rely on system codec when handling PO filesOswald Buddenhagen2009-07-174-7/+16
| | | | | | | | | | - make -input-codec affect PO files, default to UTF-8 - add -output-codec for PO files, same default
| * reorganize numerus form count normalizationOswald Buddenhagen2009-07-179-30/+51
| | | | | | | | | | | | replace implicit normalization of individual messages on file writeout with global normalization which is called by the command line tools. this should a) be faster and b) cover the most critical case: lrelease.
| * Designer fails to compile if Qt is compiled without size grip supportAntonio Aloisio2009-07-151-2/+4
| | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | doc: Increased memitemleft width from 160px to 180px.Martin Smith2009-07-202-2/+3
| |
* | checksdk now uses the bootstrap libJoerg Bornemann2009-07-204-62/+32
| | | | | | | | | | | | | | | | | | The checksdk build was broken and it makes no sense to maintain two seperate bootstrap configurations. The checksdk sources had to be corrected in certain cases to work with the bootstrap lib. Esp. using qDebug for ouput message is not a good idea. Reviewed-by: thartman
* | Compile fix for windows and winceDenis Dzyubenko2009-07-202-0/+4
| | | | | | | | | | | | | | Added qtextcodec and qutfcodec to bootstrapped applications (checksdk and configure) Reviewed-by: trustme
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-07-174-2/+11
|\ \
| * | Add priority property to QActionJens Bache-Wiig2009-07-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to support the behavior in Gtk+ where, when Qt::ToolButtonTextBesideIcon is used, only text labels for important actions are shown. It will also enable us to prioritize actions in the future when for instance collapsing a toolbar. Task-number: 258290 Reviewed-by: thierry
| * | Update to also use a uifile.icns file for Designer.Norwegian Rock Cat2009-07-173-1/+4
| | | | | | | | | | | | | | | If we are doing it for Creator, we may as well be nice and do a similar thing for Designer.
* | | Doc: Added XML Schema license information to the documentation.David Boddie2009-07-171-2/+3
|/ / | | | | | | | | Reviewed-by: Trust Me Post-review-sanity-check-by: Peter Hartmann
* | Doc: Updated the version numbers in the documentation metadata.David Boddie2009-07-177-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | Allow picking up tool button style from the systemJens Bache-Wiig2009-07-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | KDE and GNOME has the concept of a default tool button style that can be set system-wide. Qt currently allways default to IconOnly. I have added an optional Qt::ToolButtonSystemDefault value so you can opt-in to respect the system setting. We did not change the default because a lot of apps will look odd when for instance text is beside icons and the descriptive text is too long. Task-number: 237864 Reviewed-by: ogoffart
* | Update the license headers in XML Schema to the new formatThiago Macieira2009-07-162-2/+2
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-153-0/+92
|\ \
| * | Added a version information to our executables.Denis Dzyubenko2009-07-153-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | On Windows, the FileDescription part of the version information is used as a caption for the grouped taskbar button. Task-number: 253065 Reviewed-by: Prasanth Ullattil
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-1544-412/+992
|\ \ \ | |/ /
| * | Improve error message from configure.exe when trying to compile the Windows ↵David Faure2009-07-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phonon backend: - mention the DirectShow SDK, not the DirectX SDK (which doesn't include DirectShow anymore) - mention which exact files were not found, rather than just "all required files couldn't be found" Merge-request: 881 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | fix for mingw to still look into LIB and INCLUDE env varThierry Bastian2009-07-141-7/+6
| | |
| * | update to the configure program to support mingw+phononThierry Bastian2009-07-142-25/+39
| | |
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-137-170/+250
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-114/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-137-67/+168
| | | | | | | | | | | | it is simpler to keep it in sync with creator then.
| * | Merge commit 'origin/4.5'Bill King2009-07-132-15/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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
| | * Designer: Restore Widget box title when switching to docked modeJoão Abecasis2009-07-091-0/+6
| | | | | | | | | | | | Reviewed-by: Friedemann Kleint
| | * Stop showing then hiding windows on starting designer in top-level modeJoão Abecasis2009-07-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of like f37bd111f7622a34b3a7bd63f5a82f6042dc0f0d, but the real thing. The widget box wasn't showing on Linux when switching to top-level mode. Incidentally, this was the main window there... Reviewed-by: Friedemann Kleint After some persuasion the Cat also came to see things this way.