| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When loading the widget box with load mode "LoadCustomWidgetsOnly", it
will create an empty category. This will indirectly cause a resize event
to be posted for the tree widget of the widget box, which in turn will
cause adjustSubListSize() to be called for each category item in the
tree widget. Since the category has not yet been populated, the
assumption in adjustSubListSize() that cat_item->child(0) is non-null
would cause a crash. The fix is to return immediately if the category is
empty.
Reviewed-by: Friedemann Kleint
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add code to make promoted widget entries to widget DB to widget box
form builder.
Task-number: 233683
|
| |\ \ \
| |/ /
|/| /
| |/ |
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a form is loaded, Designer will set the path to the resource as
an absolute path rather than the path actually stored in the file. There
is code to work around this to make file paths relative when saving the
file later on, but no work around for Qt Jambi. So when saving Qt Jambi
forms, you would get an absolute path to the resource which contains the
location of the resource file (.jar or on disk) This of course breaks
the concept of resources, as the .jui file was no longer portable. The
fix is to special case Qt Jambi resources and set the relative path
when loading them.
The patch has no effect on regular Designer.
Task-number: 254621
Reviewed-by: Kai Koehne
|
| | |
| |
| |
| |
| |
| |
| | |
Crash when replacing the QDockWidget contents
widget by a widget using a container extension.
Task-number: 254553
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Restore 4.4 behaviour by using a QStackedLayout as the layout containing
the actual form (as was in 4.4). The difference in behaviour was caused
by insertion of an additional widget with a QVBoxLayout which is supposed
to ease setting of inheritable properties (style, etc).
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253236
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| | |
which have a grey color for text)
Task: 252251
RevBy: Markus Goetz <Markus.Goetz@nokia.com>
|
| | |
| |
| |
| |
| | |
Use QUrl::fromLocalFile to construct the url string.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| | |
|
| |
|
|
|
| |
Use QUrl::fromLocalFile to construct the url string.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| |
|
