| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Remove redundant code in qdesigner_resource ass well.
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-13683
|
|
|
|
|
|
| |
and page-based containers.
Task-number: QTBUG-18244
|
|
|
|
| |
Such that the name does not show up in lupdate.
|
|
|
|
| |
Task-number: QTBUG-17542
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Event filter was added twice due to widget initialization being
done twice caused by recursion of WidgetFactory::createWidget()
in the case of a fallback to promotion when a custom widget
plugin is missing.
Task-number: QTBUG-18121
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
|/
|
|
|
| |
This helps them to be marked up correctly in cases where code
markers are available.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In a rare case when breaking a layout might
make widgets overlap, the internal heuristic
failed when recreating an original layout during undo.
Some widgets were removed from the grid.
The patch fixes this heuristic (makes sure
we don't remove other widgets). Creating
a form layout from overlapping widgets works
better now.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTCREATORBUG-3616
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Don't call removePath() when it was not added before.
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
|
|
|
|
|
| |
In overwritten virtual QAbstractItemView::currentChanged,
invoke base implementation.
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Task-number: QTCREATORBUG-2249
|
|
|
|
|
| |
Merge-request: 2456
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Task-number: QTCREATORBUG-1952
|
|
|
|
|
|
| |
lupdate currently doesn't parse .qmake.cache, so it lacks
QT_SOURCE_TREE. so use relative paths in include statements and (the
relevant) include paths instead.
|
|
|
|
|
|
|
| |
Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525
and gcc 4.5.
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
|
|
|
|
| |
Since they are used internally for some legacy stuff.
We prohibit "groupButtonId" and "database".
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-11584
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
The internal QButtonGroup used by Q3ButtonGroup interferes with
saving mechanism for QButtonGroup (introduced in 4.5).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-11431
|
|/
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
This makes the icon position similar to Qt Creator and
more consistent.
Reviewed-by: trustme
|
|
|
|
|
|
|
| |
Using static here is obviously incorrect as the animations
are done per widget.
Reviewed-by: danimo
|
|
|
|
|
|
|
| |
First problem is that there are too many animations triggered.
Second problem is that it doesnt reflect the disabled state.
Reviewed-by: thorbjorn
|
|
|
|
|
|
|
|
| |
Fixed showing, changing and resetting of default dynamic properties
of string and keysequence type.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9603
|
|
|
|
|
|
|
| |
Another side effect of
62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b .
Task-number: QTBUG-9262
Initial-patch-by: Jarek Kobus <jkobus@trolltech.com>
|
|
|
|
|
|
| |
Resource handling broken as a side effect of
62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b .
Task-number: QTBUG-9262
|
|
|
|
|
|
| |
This had some negative side effects when used in
Qt Creator and since the kde icon now fits nicely
without this workaround I will remove it for now.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I redesigned the filter widget so that the reset button is contained
within the line edit and only shown when edited. This is typically
what KDE and GNOME does. The base icon also changed to use platform
dependant icons on X11 and a new clear icon for other platforms.
Since hinttext is now a feature of QLineEdit, I could safely
remove this code as well.
Unfortunately Oxygen is reporting incorrect contents margins for
line edits. In essence it incorrectly offsets the frame so I had
to add some magic to support that in particular.
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
| |
In case of resource property we recreate a dom property using
resource builder. We had forgot to apply stdset attribute for that case.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-8881
|
|
|
|
| |
Missing header added
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In this way we can correctly load / reload a label in case it contains
a rich text with a reference to the image taken from resources.
Since QLabel::setText() ignores the call in case we try to set the same
text, we force the reload by setting the empty string in between.
For performance reasons we do it only in cases when the text value
contains :/ (only in this case it might have a reference
to the resources).
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-8347
|
| |
|
|
|
|
|
|
|
|
|
| |
Remove special handling and storing of commands. Customize
SetPropertyCommand such that it is able to perform a transformation
of the new value., thus, the same (relative) distance can be used
on all widgets and the normal command merging mechanism can be used
to merge subsequent moves correctly.
Task-number: QTBUG-8213
|
|\ |
|
| |
| |
| |
| |
| | |
Reviewed-by: Trond Kjernåsen <trond@trolltech.com>
Task-number: QTBUG-8046
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Broken by introduction of new signal with extended parameters.
Emit both signals and block against each other.
Tested against Eclipse integration.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-7764
|
| |
| |
| |
| |
| | |
Analogous to windowTitle, etc.
Task-number: QTBUG-7822
|
| |
| |
| |
| |
| | |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
|/
|
|
|
| |
Fix spelling errors, foreach()/QString usage, explicit constructors.
Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
|
|
|
|
| |
Task-number: QTBUG-7432
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
format as in Property editor and elsewhere for consistence.
Task-number: QTBUG-6760
|
|\ |
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |
| |
| |
| |
| |
| |
| | |
The autotest are included
Task-number: QTBUG-5884
Reviewed-by: ogoffart
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Designer-formbuilder/uic incorrectly considered custom containers that
do not inherit a known page-based container (say QTabWidget) as
instances of QLayoutWidget, giving them a default margin of 0.
Add a check for the custom widget <container>-element to the checks
for QLayoutWidget in uic/formbuilder.
In the formbuilder, introduce a new data structure to store
custom widget information instead of using 3 separate hashes.
Adapt one autotest baseline (Qt 3).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5335
|
|
|
|
|
|
|
| |
... which has movable=true, conflicting with its internal
drag and drop. Introduce 'movable' as fake property.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QT-1788
|