| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| |
| |
| |
| | |
Reviewed-by: nrc
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Slightly hacky, but isolated change.
Reviewed-by: Tom
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
No need to be excessively clever here.
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: David Boddie
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: 249001, 236473
Reviewed-by: kh
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
which have a grey color for text)
Task: 252251
RevBy: Markus Goetz <Markus.Goetz@nokia.com>
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As we saw with the 4.5.1 release, failing to increment the namespaces
when incrementing the Qt version causes some featuresof Assistant to
break.
Reviewed-by: Trust Me
|
|\ \ \
| |/ / |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
242472777d440a540b4bc944c84eb522388e384e )
Changes in WebKit since the last update:
++ b/ChangeLog
2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Added support for generating API docs in the Qt build using "make docs"
* WebKit.pro: Include docs.pri for "make docs" target.
++ b/WebKit/qt/ChangeLog
2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Ariya Hidayat.
Added support for generating API docs in the Qt build using "make docs"
Added code snippets and overview from the Qt sources references in the API docs.
* Api/qwebpage.cpp: Adjust paths to snippets.
* Api/qwebview.cpp: Ditto.
* docs/docs.pri: Added.
* docs/qtwebkit.qdoc: Added.
* docs/qtwebkit.qdocconf: Added.
* docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added.
* docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added.
* docs/webkitsnippets/simple/main.cpp: Added.
* docs/webkitsnippets/simple/simple.pro: Added.
* docs/webkitsnippets/webpage/main.cpp: Added.
* docs/webkitsnippets/webpage/webpage.pro: Added.
Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit
This is needed to have "make docs" inside WebKit and allows contributors to the
WebKit project to write API docs. I'm doing the change in 4.5 to simplify
merging with Qt 4.6.
Reviewed-by: Trust me
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts (version number change in 4.5):
src/corelib/global/qglobal.h
src/qbase.pri
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|