| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Added basic support for qsTr in Qml, both in the engine and in lupdate.
|
| |
|
| |
|
|
|
|
| |
(now that deviceskins includes them as qrc, we may as well use them)
|
|\
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsscene.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network
Reviewed-by: Samuel
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Turning on LTCG affected too many projects, where customers applications
would take a long time linking, severly affecting their development time
(even though it was only added for release builds)
We turn it off by default, and add a -ltcg configuration option, and the
possibility to also do CONFIG+=ltcg in projects, should they not want it
for Qt, but in their own projects. (Same, they can build Qt with it, and
do CONFIG-=ltcg for their project)
Reviewed-by: andy
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 163220
Added to FormWindowBase. Required among other
things for Qt Creator code completion for
uic-generated-headers.
Acked-by: dt <qtc-committer@nokia.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | | |
|
| |\ \
| | |/ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also mentioned an important point: If you subclass QUiLoader and
reimplement either createAction(), createActionGroup(), createLayout(),
or createWidget() -- you must call the original implementation first,
within your implementation.
Reviewed-by: João Abecasis <joao@abecasis.name>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move skins to tools/shared/deviceskin and have them
included automatically by the profile.
Acked-by: Jason McDonald <jason.mcdonald@nokia.com>
Acked-by: Warwick Allison <warwick.allison@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A Qt project can't unconditionally do `CONFIG+=release' or
`CONFIG+=debug' since the release and debug libraries are named
differently on Windows. In this case, CONFIG+=release meant
this project was looking for QtSql.lib, but when Qt is configured
with `-debug', only QtSqld.lib exists.
Reviewed-by: Rhys Weatherley
|
| | | |
|
| | |
| | |
| | |
| | | |
Resize correctly on open new file.
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | | |
kinetic-declarativeui
|
| | | | |
| | | | |
| | | | |
| | | | | |
We introduce this new enum, we should be using it.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It is now possible run the benchmarks with "-chart" to generate
charts for benchmarks that produce chartable data. See
examples/qtestlib/tutorial5 for an example.
This patch has minimal inpact on QTestLib itself. Most of the
functionality is implemented in a separate tool which QTestLIb
calls after detecting the chart command line option.
|
| | | |\ \
| | | | |/ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't say we produce output when no options are passed if we don't.
Task-number: 222778
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The friend thing doesn't really work when it's defined in
the class you want to be a friend of, so do the promotion
technique instead.
Reviewed-by: Thierry Bastian
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
no more exported
designer was using QToolBarLayout members. We fixed that by using
styles.
Reviewed-by: Friedemann Kleint
Reviewed-by: ogoffart
|
| |/ / / |
|
|/ / / |
|
| | |
| | |
| | |
| | | |
Broke with mainwindow introduction.
|
| | |
| | |
| | |
| | | |
input.
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
QProgressDialog not very good.
|
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
kinetic-declarativeui
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: nrc
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | | |
kinetic-declarativeui
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | | | |
|
| | | | |
|