| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
it is simpler to keep it in sync with creator then.
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/kbddrivers/usb/main.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qwidget/tst_qwidget.cpp
|
| |
| |
| |
| | |
cherry-picked 07730341bd739aac823ac9b4336d8294510a35e2 from creator
|
| |
| |
| |
| | |
cherry-picked 167a09b20614d282ec898f69fc2a3f0bafa11229 from creator
|
| |
| |
| |
| | |
cherry-picked d8b1cc5f0ecbb8de734d241d72a05b325c2bbb2c from creator
|
| |
| |
| |
| | |
Reviewed-by: Friedemann Kleint
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
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
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| | |
| | |
| | |
| | |
| | | |
Also changed qdoc not to warn about undocumented parameters
if the function is marked with the \reimp command.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
-debug/release/debug_and_release
- build qdoc3 always into tools\qdoc3 rathern than release/debug subdirs
- call it from there
Reviewed-by: Marius SO
|
| |
| |
| |
| |
| |
| | |
when paths to the ActiveSync headers/libraries are not set up.
Reviewed-by: Michael Goddard
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|