| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Improvements to the QGLShaderProgram API
|
| |/
|
|
|
|
|
|
|
|
| |
GLfloat[2][2] & GLfloat[3][3] uniform setters.
Generic overrides to setAttributeArray() for setting the component
type to something other than GL_FLOAT.
setAttributeBuffer() for specifiying offsets within vertex buffers.
Task-number: QTBUG-7391
Reviewed-By: Sarah Smith
|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Remove obsolete OpenGL/ES CommonLite (fixed-point) support
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Qt applications not responding to WM_GETHOTKEY on windows.
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On windows when an application has been started through a shortcut link,
(either by double-clicking or by pressing the shortcut key assigned in
the link) the STARTUPINFO contains the hotkey associated to the
application. This should be set on the toplevel using WM_SETHOTKEY, so
that it behaves like native applications.
Task-number: QUTBUG-3426
Reviewed-by: Jens Bache-Wiig
Reviewed-by: bnilsen
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QDir fix issues with (shared) cached lists
qdoc3: Added support for the \qmlbasictype command.
Move the Hungarian translation to the translations folder
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With 2964718224c0ed356511335742368d4fc421c6bd, QDir started really using
the cached file lists. However, these were not being properly updated on
setNameFilters, setFilter and setSorting.
QDir::refresh, on the other hand, would invalidate the lists without
first detaching, thus breaking the copy-on-write promise.
Summarizing, shared data must be detached and cached lists invalidated,
so they get regenerated.
Reviewed-by: Olivier Goffart
Reviewed-by: Ritt Konstantin
|
| | | |
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QFileDialog: Compilation fix on windows
Add Q_MOVABLE_TYPE decls to QVector?D, QMatrix4x4, QQuaternion
|
| | |
| |
| |
| |
| | |
The structs that we declare are all now prefixed with qt_ to avoid
clashes with system defined ones.
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Marking these types are movable allows container classes
to optimize for their unique properties.
Reviewed-by: Sarah Smith
Reviewed-by: Daniel Pope
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add Qvfb hungarian translation
Add Qtconfig hungarian translation
Add Linguist hungarian translation
Add Designer hungarian translation
Add Qt help hungarian translation
Add Assistant hungarian translation
Add Qt base hungarian translation
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Laszlo Papp <djszapi@archlinux.us>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QSortFilterProxyModel: Fix dynamic sorting when severals rows are added.
QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to update the sorting column in clear_mapping.
But the problem is that updating the source column create a mapping
(because it uses mapToSource). So we need to clear that wrong mapping again
In _q_sourceLayoutChanged there was an uneeded special case.
The case where the source_sort_column might change was never triggered
because of that. So now that the special case has been removed, we need
to do as in clear_mapping.
The test cover the change in clear_mapping and in _q_sourceLayoutChanged
The problem was shown in the Kopete: https://bugs.kde.org/show_bug.cgi?id=199850
Reviewed-by: Thierry
Task-number: QTBUG-7537
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When using TextSelectableByMouse or TextSelectableByKeyboard, this
allows to programmatically control the selection. Needed in KDE's
KSqueezedTextLabel, so that mouseReleaseEvent can get the selection
and copy the un-squeezed text instead of the squeezed one.
Merge-request: 454
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed maketestselftest failure with some MSVC versions.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Fix a problem with overlay icons in the fileiconprovider
Only set the _WIN32_WINNT define if it is not set or less than 0x0400
QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Fix autotest memory leak
Carbon: crash problem in QWidgetPrivate::hide_sys, v2
Carbon: crash problem in QWidgetPrivate::hide_sys
|
| | |\ \ \
| | | |/
| | |/| |
|
| | |\ \ \ |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed maketestselftest failure with some MSVC versions.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Fix a problem with overlay icons in the fileiconprovider
Only set the _WIN32_WINNT define if it is not set or less than 0x0400
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
The generated `tests/auto/tmp' directory was causing this test to fail.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-28 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Simon Hausmann.
Do not set the combobox font on Maemo5 and S60; use the
default instead.
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopup::populate):
2010-01-28 Andreas Kling <andreas.kling@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Support kinetic scrolling on Maemo 5
https://bugs.webkit.org/show_bug.cgi?id=34267
Patch by Ralf Engels <ralf.engels@nokia.com> and
Robert Griebl <rgriebl@trolltech.com>
* Api/qwebview.cpp:
(QWebViewKineticScroller::QWebViewKineticScroller):
(QWebViewKineticScroller::eventFilter):
(QWebViewKineticScroller::currentFrame):
(QWebViewKineticScroller::scrollingFrameAt):
(QWebViewKineticScroller::attachToWidget):
(QWebViewKineticScroller::removeFromWidget):
(QWebViewKineticScroller::positionRange):
(QWebViewKineticScroller::position):
(QWebViewKineticScroller::viewportSize):
(QWebViewKineticScroller::setPosition):
(QWebView::QWebView):
2010-01-29 Kenneth Rohde Christiansen <kenneth@webkit.org>
Reviewed by Simon Hausmann
Disable auto-uppercase and predictive text on Maemo5, just like the
build-in MicroB Browser.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Adding SHGFI_OVERLAYINDEX will append a system overlay identifier
to the hIcon member, giving us a unique cache id for overlayed icons.
Without this we could end up with having random overlays on icons depending
on which one we loaded first.
Task-number: QTBUG-7663
Reviewed-by: prasanth
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
By checking the define before setting it, it ensures that its not
set to one that is actually lower than the value currently set to.
Reviewed-by: kkoehne
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Fix autotest memory leak
Carbon: crash problem in QWidgetPrivate::hide_sys, v2
Carbon: crash problem in QWidgetPrivate::hide_sys
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
should be documented as QT3 support member
Task-number: QTBUG-7786
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-01-28 Trond Kjernåsen <trond@trolltech.com>
Reviewed by Simon Hausmann.
[Qt] Fix for endless print loop when printing web pages
* Api/qwebframe.cpp:
(QWebFrame::print):
2010-01-26 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Show comboboxes on Maemo 5
https://bugs.webkit.org/show_bug.cgi?id=34088
Don't try to show the combobox by simulating a mouse event from QCursor::pos() to
get the combobox position right. The position on Maemo 5 is independent from the mouse
and there's no QCursor::pos().
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopup::show):
2010-01-26 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Simon Hausmann.
[Qt] JavaScript prompt is currently broken
https://bugs.webkit.org/show_bug.cgi?id=30914
In r52152 a patch was landed to convert a null QString
to an empty WebCore::String in case the prompt was accepted
but the default implementation returned the null QString.
The patch tried to avoid assign to result twice and
was not checking the QString if it is null but the default
value. This lead to always returning an empty string on
successful prompts. Fix it by checking the variable 'x'
for isNull.
The manual test case used didn't cover the case of non
empty input, replace it with an automatic test case that
should cover all cases.
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::runJavaScriptPrompt): Fix the bug.
* tests/qwebpage/tst_qwebpage.cpp: Add automatic test case
(JSPromptPage::JSPromptPage):
(JSPromptPage::javaScriptPrompt):
(tst_QWebPage::testJSPrompt):
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
See change: f842ec12706. Needed some ekstra checks for
the cocoa port as well.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
(cherry picked from commit ebf9c943b789bb4ce1e1222ed17cc37bd0b1f1fe)
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The crash occurs because we at one point try to assign a widget that
is marked as 'about to be deleted' to a QPointer, after clearguards
has been called. The correct fix is to avoid such an assignment in
the first place.
Task-number: QTBUG-4227
Reviewed-by: Prasanth
(cherry picked from commit f842ec12706b70f94ab5f634dc2aa025ba2cf3f2)
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use RefPtr to store QScriptProgram's EvalExecutable
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
tools/linguist/lupdate/main.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Otherwise we crash with latest WebKit trunk because the
SourceProvider is prematurely destructed.
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | /
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "add QModelIndex::rowCount() and QModelIndex::ColumnCount convenience methods"
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
methods"
This reverts commit c74deadf4b7eeb2800b318e0952dac8f700d9236.
The convinience method are missleading because it does not work
for the root model index.
Also, the test is missing, and the function should have been added
in the mirror class QPersistentModelIndex
Reviewed-by: Thierry
Reviewed-by: Leo
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Placate pedantic compiler warning modes on QGLBuffer
Promote QPixmap::convertFromImage() to public API from Qt3Support
Add the QGLBuffer class to Qt 4.7 for VBO's
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Placate pedantic compiler warning modes on QGLBuffer
Promote QPixmap::convertFromImage() to public API from Qt3Support
Add the QGLBuffer class to Qt 4.7 for VBO's
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Sarah Smith
|
| | | |\ \ \ \ \ |
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add the QGLBuffer class to Qt 4.7 for VBO's
|
