| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Wrong list was used when adding widgets.
Task-number: QTBUG-18120
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix a regression introduced by dd7873cd7e02e42b384709f33a34f69bc06fb25d
of QTBUG-17179.
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTBUG-17358
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Object search found deleted widgets by name when
searching on the form window. Search main container
instead, do not assert.
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-17179
|
|/
|
|
|
| |
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
|
|
|
|
|
|
|
| |
As it causes an obscure deletion crash related to
the formeditor rubberband on Mac.
Reviewed-by: con
|
|
|
|
|
|
|
| |
Don't call removePath() when it was not added before.
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits)
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
Doc: Fixing bug - line too long and not visible. Breaking the line in two
Doc: Fixing typo
Doc: Fixing snippet bug. Path pointing to the wrong snippet
Doc: Fixed doc references to non-existing API
Doc: Fix broken links in QSslConfiguration
Added a project file for the Getting Started with QML and changed the
Clarified the auto connect enumeration regarding which type of
Added installation section and fixed some whitespace.
Doc: Fixing spacing bug in columns
Doc: Fixing bug in QML tutorial
...
|
| | |
| | |
| | |
| | |
| | |
| | | |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|/ /
| |
| |
| |
| | |
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-14208
|
|/
|
|
|
|
|
| |
opensource versions
Reviewed-by: Olivier Goffart
Merge-Request: 843
|
|
|
|
| |
Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Output as 'filename: Warning: message' and make some uic
warnings more verbose to make Qt Creator parsing easier.
Fix resource warning in Qt Designer.
Reviewed-by: dt
Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Merge-request: 2463
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Task-number: QTCREATORBUG-1952
|
|
|
|
|
| |
Task-number: QTBUG-12485 QTBUG-12651
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
| |
there are now per-language ts-<package>-<lang> and ts-<lang> targets to
update only the files relevant for a given language.
there is also a ts-all target which does what the old ts target did.
the ts-<package> targets are now named ts-<package>-all and should not
be used manually - they exist for the convenience of the ts-all target.
the ts target is now only a help blurb.
|
|
|
|
|
|
| |
lupdate is now powerful enough to use the real project files.
this avoids that the file lists run out of sync (which they did, though
not as much as i expected).
|
|
|
|
|
|
| |
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: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
This makes the icon position similar to Qt Creator and
more consistent.
Reviewed-by: trustme
|
|
|
|
|
| |
Task-number: QTBUG-10626
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
| |
In order to avoid native pixmap object leaking remove
statically allocated pixmaps through the post routine.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9815
|
|
|
|
|
|
|
|
|
|
|
| |
Designer has written verticalHeaderVisible property in ui file twice:
once done implicitly while saving the fake properties and
once done explicitly inside QDesignerResource by calling
saveWidget(QTableView/QTreeView). The latter is removed as
it is redundant now.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9351
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
Some tool actions are hidden by default (undo/redo, cut.copy.paste),
the user can bring them back by using View|Toolbars|Configure Toolbars
dialog.
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
|
|
| |
Another side effect of
62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b .
Task-number: QTBUG-9262
Initial-patch-by: Jarek Kobus <jkobus@trolltech.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We modified the label so that it gets its own row instead of
squeezing it into the tool bar. This layout would usually not
have room for more than short labels and looked rather
unprofessional when used in Creator. The new label is properly
elided. We also added a frame to distinguish it from the dock
widget label.
Reviewed-by: Friedemann Kleint
|
|
|
|
|
|
|
|
|
|
| |
Added standard theme icons for Save As, Print, Close, Quit, Recent Files
and Clear Recent Files.
Also slighly optimize non-X11 platforms by not calling QIcon::fromTheme
at all.
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
|
|
|
|
|
|
| |
Resource handling broken as a side effect of
62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b .
Task-number: QTBUG-9262
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|