| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.cpp
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobject.h
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
"../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray".
Reviewed-by: Trust Me
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/widgets/qlinecontrol_p.h
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
STL support hasn't had binary compatibility effects for the entire
lifetime of Qt 4, so it should never have been there. It is a legacy
thing I am now correcting.
When inspecting a plugin, remove the "no-stl" from its loaded build
key. That indicates a pre-4.6 build, since now Qt no longer adds it to
its own build keys.
Note that you have to remove the 4.6 plugin cache from
$HOME/.config/Trolltech.conf or the registry for this change to work
(if you compile Qt with -no-stl). Otherwise, plugins that have already
been scanned will fail to load.
Reviewed-by: Bradley T. Hughes
|
| | | | | |
|
| | |/ /
| | | |
| | | |
| | | | |
Reviewed-by: Martin Smith
|
| |_|/
|/| | |
|
| | | |
|
|/ / |
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.cpp
|
| | |
| | |
| | |
| | | |
Only for obsolete links from non-obsolete things.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The AdpReader checked for a version attribute == 3.2.0.
This has been replaced by a check for >= 3.2.0
Task-number: 258551
Reviewed-by: kh
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moved common parts of QHelpSearchIndexReader{Default,Clucene} into
a new common base class QHelpSearchIndexReader.
Reviewed-by: kh
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h
src/3rdparty/webkit/WebCore/page/DragController.cpp
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/gui/painting/qpaintengineex_p.h
tools/linguist/lupdate/main.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Regression breakage introduced by the PropertySheet::isEnabled handling in 4.5.
Task-number: 253278
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The translator had been installed for the jui format, but the extension
wasn't recognized.
Task-number: 258547
Reviewed-by: Gunnar
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For cross compilation of Qt for Windows CE the user must call
setcepaths before nmake. Now configure shows a helpful message if the
xplatform configure switch was used.
Task-number: 257352
Reviewed-by: thartman
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: thartman
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tools/qmlviewer/qmlviewer.h
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Add a colorGroup property and remove palette properties from the
root context.
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | | |
While recording video, ignore realtime rate and deliver perfect
per-frame animation.
|
| | | |
|
| | |
| | |
| | |
| | | |
Use QWidget::render instead of QPixmap::grabWidget
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
configure
configure.exe
src/gui/kernel/qaction.h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Setting a file from a resource would result in 'qrc::/file' as
the resource browser returns ':/file'.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Initial-patch-by: andy <qt-info@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
Also marked the other QHttpXxx classes as \obsolete.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The classes marked \obsolete are no longer included in the
"All Classes" list. They are listed separately on an
"Obsolete Classes" list. The new page is reachable from the
"All Classes" page and from the "Grouped Classes" page.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mauricek
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: ossi
cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator
|
| | | |
| | | |
| | | |
| | | | |
cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator
|
| | | |
| | | |
| | | |
| | | | |
cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
which basically means cutting features. heh
cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator
|
| | | |
| | | |
| | | |
| | | | |
cherry-picked e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 from creator
|
| | | |
| | | |
| | | |
| | | | |
cherry-picked 88de3e6a45a41baecb7e56e7cbab7fec30ac0a1c from creator
|
| | | |
| | | |
| | | |
| | | | |
cherry-picked d89338aa810861c636278be4a5bb5d8b23ce99b8 from creator
|