| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |_|/
|/| |
| | |
| | | |
Handle palette changes in QmlPalette.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Merge commit 'c1491ff950f7da733c21bd3f00b88309397cf622' into HEAD
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Merge commit 'aff53500dbfba0a3338f8ab649c754cce3569ede' into HEAD
|
| | |/
| |/| |
|
| |/
|/| |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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"
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-developer-build, part 1.
Adds QT_CONFIG+=private_tests to qconfig.pri when Qt is configured
with -developer-build.
Reviewed-by: Michael Goddard
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Task-number: 256647
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 803
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 257441
Reviewed-by: kh
|
| | |
| | |
| | |
| | | |
Reported via qt-bugs
|
| | |
| | |
| | |
| | | |
Task-number: 189232
|
| | |
| | |
| | |
| | |
| | |
| | | |
The qhelpgenerator auto test was also updated to test the new feature.
Reviewed-by: kh
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- .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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDBusAbstractInterface.
They're now good enough and as fast.
Reviewed-By: Marius Bugge Monsen
|
| | |
| | |
| | |
| | | |
Requirement: QT-457
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh <qtc-committer@nokia.com>
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: Michael Goddard
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|