| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added some static functions to QIcon to support desktop
themes based on the freedesktop spec. It is not intended to
replace KIcon and the intention is to use it when available to
share icon cache between applications.
Applications currently using icon themes are Assistant, Designer
and the textedit demo.
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
|
|
|
| |
Use widget->layoutDirection() instead of QApplication::layoutDirection()
where applicable, which caused it to break for the case that Designer's
layoutDirection does not match that of a widget [property].
In addition, position the submenu correctly on the left side in the case
of RTL.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: 259238
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| | |
widgets.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
| |
| |
| |
| |
| | |
stacked widgets.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The form builder used for preview of the templates did not implement
custom widget handling (FormBuilder::createCustomWidgets()).
On encountering a promoted widget, the widget factory
would then create a Widget Database entry specifying QWidget
inheritance (emergency fallback) which could not be overidden later
on.
To fix this, moved the code for handling custom widgets from
QDesignerResource to QSimpleResource and create a new
formbuilder class that handles it especially for the New Form Dialog
preview.
Task-number: 254282
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDesignerFormWindowCursor::setProperty.
Ensure the text does not get clobbered by the subproperty handling.
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253278
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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:
tests/auto/qpainterpath/tst_qpainterpath.cpp
|
| |
| |
| |
| |
| | |
Task: 251248
Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| |
| |
| |
| | |
Use PropertySheetKeySequenceValue instead of plain strings.
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/inputmethod/qximinputcontext_x11.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
These were reported by mkdist
Reviewed-by: TrustMe
|
|/ /
| |
| |
| |
| | |
Task: 249659
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
Inside DesignerEditorFactory::createTextEditor() we first do setText() and afterwards we do setTextPropertyValidationMode(). setTextPropertyValidationMode() didn't update the cached text. Below patch fixes it.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: 245503
|
| |
|
|
|