| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: David Boddie
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There was an off-by-one error when QPlainTextEdit
calculated the number of visible lines (not blocks)
on the screne. When running into the error case,
the number of visible lines was falsely 0 (not 1),
which resulted in all softs of negative side effects
as the scrollbar permitted the user to scroll
behind the last paragraph.
Task-number: QTBUG-17230
Reviewed-by: con
|
|\ \
| |/
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The micro focus rect changes both when the regular cursor position
and the pre-edit cursor positions change. Ensure updateMicroFocus
is called TextInput in both cases.
Change-Id: I6822a710b841e106ce2462f74fea398250596913
Task-number: QTBUG-17396
Reviewed-by: Martin Jones
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | |
| | | |
| | | |
| | | |
| | | | |
And removed some \raw cases. Only 13 raw-html uses remaining.
Added the figCaption clause to style.css.
|
| | | |
| | | |
| | | |
| | | | |
Only 22 raw-html uses remaining.
|
| |\ \ \ |
|
|\ \ \ \ \
| | |_|/ /
| |/| | /
| |_|_|/
|/| | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
77cba04c2 assumed a level of bounds checking in QTextLayout that does
not exist.
Task-number: qtbug-15818
Reviewed-by: Michael Brasser
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Word selection occasionally selected the word beforehand as well, in
both QLineEdit and TextInput.
Visual Test included to verify behavior.
Task-number: QTBUG-15818
Reviewed-by: Martin Jones
|
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QCombobox popup opens into incorrect position in Sym^3. This is due
to that there is a new layout in use, where softkeys are positioned
at the bottom. The current implementation just checks if native stacon
component is in use and if not, puts the popup to left/right border
of the application area (depending on UI direction).
Task-number: QTBUG-16886
Reviewed-by: Miikka Heikkinen
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes crash in QGraphicsItem's destructor.
Doc: Fixing typo
|
| | |/ / |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix number of chapters in qtestlib tutorial.
Fixed QStatusBar not to repaint itself too early
QNAM HTTP: Fix missing error() signal
Make it clear which security updates are needed for Visual Studio 2005.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the toplevel containing a statusbar is initially shown, QStatusBar
will repaint itself way too early - repaint() is called from the
LayoutRequest event causing a whole window repaint before the window was
resized to the proper size.
This caused Qt Creator to paint itself in small size in a maximized
window on its startup.
Task-number: QTBUG-14547
Reviewed-by: Olivier Goffart
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
|
| |\ \
| | |/ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: popup hides behind window
Cocoa: combobox does not hightlight when mouse re-hovers the first item
Cocoa: Fix addChildWindow bug where we connect a grandparent to a child
Cocoa: cannot use staysOnTop flag for native file dialogs
Cocoa: make sure stays on top child windows are not levelled down
Cocoa: native child filedialogs sometimes shows non-native on screen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The reason is that on Mac, the highlight is supposed to switch off when
the mouse moves out of the drop down menu. On X11, it stays. So there is
a separate code path for this in qcombobox.cpp. But it fails to clear the
index set in the view when the mouse leaves, which stops the item from
re-highligh when the mouse re-enters.
Reviewed-by: ogoffart
|
| |\ \ \
| | |/ / |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
A function resetCursorBlinkerTimer was introduced to QLineControl.
Each time the cursor position in a textInput is updated, the blinker
timer is reset.
Task-number: QTBUG-15815
Reviewed-by: Martin Jones
|
| |\ \ \ \ \
| | |/ / / / |
|
| | |\ \ \ \
| | | |/ / /
| | |/| | /
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove whitespace and leading tab from documentation change
Updating merge request 2512
QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache
Fix integer overflow in bitfield
Fix documentation for QML extended types
Removes the reseting of the QMenu offset.
Adding warning to QMenu documentation
Fix filtering of columns in QSFPM.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12119
Reviewed-by: TrustMe
|
| | | |\ \ |
|
| | | | |/
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the QMenu is made visible using show() it causes problems because
the scrolling and layout is not set properly. The warning suggests to
use exec() or popup() instead.
Task-number: QTBUG-12119
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Removing unnecessary comments and changing define to Q_OS_SYMBIAN.
Task-number: QTBUG_9505
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On s60 when the qmenu is opened on the second time, it restores the
position of the last activated menu, so there is no need to reset the
offset when the popup() is called again.
Task-number: QTBUG-9505
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
80 characters width can be longer than maximum size of QLabel.
Restrict to max size.
Task-number: QT-4354
Reviewed-by: Sami Merila
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
|
| |/
| |
| |
| | |
Task-number: QTBUG-15516
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/platforms/compiler-notes.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/pagegenerator.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextEdit::setDocument() has failed to delete its current document
since June 2006 despite its claims of the otherwise. Since most Qt
versions now exhibit this behavior, the only safe way to fix the problem
is to change the documentation to reflect what actually happens.
Task-number: QTBUG-14049
Reviewed-by: Lars
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Locales using dot as thousands delimiter and comma as decimal
separator are prone to this error.
This is a regression introduced by commit b81b8e43ad57183ed66.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG_14935
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Fixed case of a library file name to enable MinGW builds on Fedora.
Doc: Made Qt::TextLongestVariant internal again.
Doc: Fixed minor documentation issues.
Doc: Reorganized the platform and compiler notes pages.
Doc: Removed non-ASCII characters and reformatted the text.
Doc: Fixed documentation style and qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed snippet reference for the Getting Started QML guide.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Renamed an external reference to work around an auto-linking issue.
Doc: Fixed qdoc warnings.
Doc: Fixed links to the online BSD license information.
Doc: Fixed qdoc warnings.
Doc: Re-added a link to the Qt site related to testing tools.
Doc: Marked some new properties as internal for now.
Doc: Renamed a project file.
Doc: Added missing examples and snippets.
|
| | |\ |
|
| | |\ \ |
|
| | |\ \ \ |
|