summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Updated the french phrasebook (some translations from Qt Creator)Pierre Rossi2009-07-091-1/+226
| | | | | | | | Reviewed-by: TrustMe
* | qdoc: Removed unnecessary error report/ruleMartin Smith2009-07-091-0/+3
| | | | | | | | | | | | | | | | qdoc reported an error if you used \section2 on its owin, i.e. with no outer \section1. While strictly speaking correct, it imposed an unnecessary restriction, e.g. sometimes you just want to use \section2 to get a smaller title for a section.
* | Let cetest return nonzero when it fails to run a test.Rohan McGovern2009-07-091-0/+1
| |
* | Improved cetest error reporting.Rohan McGovern2009-07-092-6/+10
| | | | | | | | | | | | | | | | | | | | | | Now, if you try to run an unsigned test on a locked device, you'll get: "Error invoking qRemoteLaunch on \Windows\QtRemote.dll: Invalid Signature. (0x80090006)" Instead of what you would previously get: "Error: Could not execute target file"
* | Disable private unit tests when Qt is configured withoutRohan McGovern2009-07-091-1/+4
| | | | | | | | | | | | | | | | | | -developer-build, part 1. Adds QT_CONFIG+=private_tests to qconfig.pri when Qt is configured with -developer-build. Reviewed-by: Michael Goddard
* | Merge commit 'origin/4.5'Bill King2009-07-089-47/+77
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * don't drop all location tags after the first file without anyOswald Buddenhagen2009-07-081-2/+3
| | | | | | | | Task-number: 256647
| * Stop showing then hiding windows on starting designer in top-level mode.Norwegian Rock Cat2009-07-071-3/+2
| | | | | | | | | | | | | | | | | | We've had this since 4.5 and it's very annoying to see the window show and quickly hide itself. I was hoping it wasn't a bug in Qt, and it turns it isn't and it was happening on all platforms. Reviewed-by: Friedemann Kleint Shout outs: João for testing.
| * Add basic Russian translation for qtconfigRitt Konstantin2009-07-061-0/+1
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for qvfbRitt Konstantin2009-07-061-0/+1
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian Qt phrase bookRitt Konstantin2009-07-061-10/+42
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Removed superfluous code in assistant's search module.ck2009-07-063-16/+6
| | | | | | | | Reviewed-by: kh
| * Fixed race condition in search module.ck2009-07-063-15/+21
| | | | | | | | | | Task-number: 257441 Reviewed-by: kh
| * Minor: fix spelling in configure.exe -help output.Thiago Macieira2009-07-021-1/+1
| | | | | | | | Reported via qt-bugs
* | doc: Output a clearer "All functions in this class are..." statement.Martin Smith2009-07-084-53/+156
| | | | | | | | Task-number: 189232
* | Added wildcard support for file lists in help projects.ck2009-07-071-3/+19
| | | | | | | | | | | | The qhelpgenerator auto test was also updated to test the new feature. Reviewed-by: kh
* | general wording change for some file type namesFrederik Schwarzer2009-07-0618-62/+62
| | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | support for id-based translationsOswald Buddenhagen2009-07-064-17/+126
| | | | | | | | | | | | | | | | | | | | | | unlike in an earlier attempt, ids are textual this time. the developer is able to provide a template for the string. when lupdate and lrelease are integrated into the build process, this makes it possible to avoid a round-trip to a dedicated string designer during the early development stage. Requirement-id: QT-435
* | remove arbitrary string length limitsOswald Buddenhagen2009-07-061-11/+2
| |
* | qdoc: Added missing CR to help message.Martin Smith2009-07-061-1/+1
| |
* | Merge branch 'research/qdbus-improvements'Thiago Macieira2009-07-021-7/+4
|\ \
| * | Replace internalPropGet and internalPropSet with the QObject versions in ↵Thiago Macieira2009-07-021-7/+4
| |/ | | | | | | | | | | | | | | QDBusAbstractInterface. They're now good enough and as fast. Reviewed-By: Marius Bugge Monsen
* | add support for attaching meta data to translatable messagesOswald Buddenhagen2009-07-021-5/+30
| | | | | | | | Requirement: QT-457
* | Merge branch '4.5'Thiago Macieira2009-07-026-23/+114
|\ \ | |/
| * Sync with QtCreator.kh2009-07-014-10/+94
| | | | | | | | Reviewed-by: kh
| * Sync with QtCreator.kh2009-07-011-9/+13
| |
| * Do not start Assistant without at least an empty page.kh2009-07-011-2/+5
| | | | | | | | | | | | | | | | Noticed while looking into task 256903, since in case there are no recent shown pages,we would start Assistant only showning the search. Task-number: 256903 Reviewed-by: kh
| * Improve QtHelp error reporting.Friedemann Kleint2009-07-011-2/+2
| | | | | | | | Reviewed-by: kh <qtc-committer@nokia.com>
* | doc: Corrected several qdoc warnings.Martin Smith2009-07-022-2/+4
| |
* | Fixed cetest compile.Rohan McGovern2009-07-021-1/+1
| |
* | Let cetest deploy libraries other than for Qt to make it usable forRohan McGovern2009-07-021-5/+29
| | | | | | | | | | | | | | | | | | | | | | running unit tests for projects outside of Qt. Let cetest look in the paths given with `-L' in LIBS, and to deploy libraries whose names don't start with `Qt'. This also fixes deployment of Qt autotests which link against phonon (the only Qt library whose name doesn't start with `Qt'). Reviewed-by: mauricek
* | Let QtRemote report the error code to cetest when creating the testRohan McGovern2009-07-023-5/+21
| | | | | | | | | | | | | | | | | | process fails. This gives some hint to the user in the case of problems like missing DLLs, as opposed to silent failure. Reviewed-by: Michael Goddard
* | Improve cetest error reporting.Rohan McGovern2009-07-023-2/+38
| | | | | | | | Reviewed-by: Michael Goddard
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-07-0110-190/+79
|\ \
| * | tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-019-189/+78
| | | | | | | | | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | doc: Fixed several qdoc error reports.Martin Smith2009-07-011-1/+1
| | | | | | | | | | | | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
* | | Make "make docs" in QTDIR work on Windows, independent of configure ↵Volker Hilsheimer2009-07-011-0/+1
|/ / | | | | | | | | | | | | | | | | -debug/release/debug_and_release - build qdoc3 always into tools\qdoc3 rathern than release/debug subdirs - call it from there Reviewed-by: Marius SO
* | Fixes configure.exe silently disabling cetest even if you asked for itRohan McGovern2009-07-011-1/+9
| | | | | | | | | | | | when paths to the ActiveSync headers/libraries are not set up. Reviewed-by: Michael Goddard
* | const ref for foreach()Oswald Buddenhagen2009-06-301-1/+1
| |
* | Linguist: defers the creation of the QPrinterThierry Bastian2009-06-302-8/+20
| | | | | | | | | | | | | | | | On windows, if your default printer is not reachable it would take a lot of time to fail to construct the print engine. During that time the UI would be frozen on the splash screen. Reviewed-by: ossi
* | Merge branch '4.5'Marius Storm-Olsen2009-06-302-4/+14
|\ \ | |/