summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-152-2/+1
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-1413-20/+322
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/parser/qmljsparser.cpp
| * | Libraries and library versioning.Warwick Allison2009-07-142-1/+9
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-1253-266/+916
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlscriptparser.cpp src/declarative/qml/qmlscriptparser_p.h Compiles, but probably next needs a revert/change of module stuff, since that work seems to have been duplicated.
* | | | Make QmlPalette properties notifiable.Yann Bodson2009-07-152-11/+1
| |_|/ |/| | | | | | | | Handle palette changes in QmlPalette.
* | | typoYann Bodson2009-07-141-1/+1
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-1411-20/+292
|\ \ \ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Merge commit 'c1491ff950f7da733c21bd3f00b88309397cf622' into HEAD
| * | | Missing filesAaron Kennedy2009-07-143-0/+44
| | | |
| * | | Rename classesAaron Kennedy2009-07-147-21/+21
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-1451-257/+916
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Merge commit 'aff53500dbfba0a3338f8ab649c754cce3569ede' into HEAD
| * | | Start moving debugger out of processAaron Kennedy2009-07-134-2/+230
| | |/ | |/|
* | | Add access to Qt palettes from QML.Yann Bodson2009-07-142-0/+30
| |/ |/|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-1051-257/+916
|\ \ | |/ |/| | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * 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
* | | Fix bad mergeMichael Brasser2009-07-022-5/+0
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-0246-379/+844
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * | 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>
generated by cgit v0.12 at 2024-10-25 11:39:26 (GMT)