| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David Boddie
Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David Boddie
Doc: Fixed and synchronized QWebView related documentation.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Re-apply change 422c747c5108f9f0c544b5dd0789df32aa498fb7 by Martin Smith
Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin Smith
Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin Smith
doc: Changed Trolltech to Nokia
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Re-apply change 2fbc823bb66db6ef6f6acc74d2baa96ebe1dec81 by Jocelyn Turcotte
Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn Turcotte
Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn Turcotte
Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39
by Simon Hausmann
Fix crash of QtScript on Mac OS X
When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause
it to crash.
For now fall back to the use of mmap() as allocator instead.
Reviewed-by: Kent Hansen
|
|
|
|
|
|
| |
Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QI
Fix tst_qwebpage and tst_qwebframe compilation on Symbian.
RevBy: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
363898ca378e2198b855ca2f8921c5e4f898c5e2 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2009-11-09 Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
https://bugs.webkit.org/show_bug.cgi?id=30772
Add a non-const iterator to QWebElementCollection.
Move the two attributes of the iterator to private.
* Api/qwebelement.h:
(const_iterator::begin):
(const_iterator::end):
(const_iterator::constBegin):
(const_iterator::constEnd):
(const_iterator::iterator::iterator):
(const_iterator::iterator::operator*):
(const_iterator::iterator::operator==):
(const_iterator::iterator::operator!=):
(const_iterator::iterator::operator<):
(const_iterator::iterator::operator<=):
(const_iterator::iterator::operator>):
(const_iterator::iterator::operator>=):
(const_iterator::iterator::operator++):
(const_iterator::iterator::operator--):
(const_iterator::iterator::operator+=):
(const_iterator::iterator::operator-=):
(const_iterator::iterator::operator+):
(const_iterator::iterator::operator-):
* tests/qwebelement/tst_qwebelement.cpp:
(tst_QWebElement::nonConstIterator):
(tst_QWebElement::constIterator):
2009-11-09 Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Kenneth Christiansen.
[Qt] Remove the sessionStorage setting (per Page)
https://bugs.webkit.org/show_bug.cgi?id=31249
This setting allows to run sessionStorage on/off on a per page
basis. Remove this prematurely exposed API.
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
(QWebSettings::QWebSettings):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::database):
(tst_QWebPage::testOptionalJSObjects):
2009-11-09 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Remove the QWebPage:webInspectorTriggered signal.
User customization of the communication between QWebPage
and QWebInspector will be properly designed in the next version.
https://bugs.webkit.org/show_bug.cgi?id=30773
* Api/qwebinspector.cpp:
* Api/qwebpage.cpp:
(QWebPagePrivate::getOrCreateInspector):
(QWebPage::triggerAction):
* Api/qwebpage.h:
* QtLauncher/main.cpp:
(MainWindow::MainWindow):
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added a missing re-implementation of QGraphicsItem::inputMethodQuery().
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::inputMethodQuery):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Provide a dummy re-implementation of QGraphicsLayoutItem::sizeHint(),
similar to QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::sizeHint):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed zoomFactoryChanged() signal and added
linkClicked() to QGraphicsWebView, for consistency with
QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::setPage):
(QGraphicsWebView::setZoomFactor):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added QGraphicsWebView::findText() for convenience and consistency
with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::findText):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added QGraphicsWebView::pageAction() and triggerPageAction(), for
consistency with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::pageAction):
(QGraphicsWebView::triggerPageAction):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed QGraphicsWebView::toHtml() after API review.
That's consistent with QWebView and also based on the assumption that
toHtml() is called less frequently than setHtml().
* Api/qgraphicswebview.cpp:
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed the interactive property of QGraphicsWebView.
There are clearly use-cases for this feature, but it will require
more work to make this fully work with an enum to have fine-grained
control over the interactivity levels. For now it is easy to achieve
in user-code what the boolean property did.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
(QGraphicsWebView::hoverMoveEvent):
(QGraphicsWebView::mouseMoveEvent):
(QGraphicsWebView::mousePressEvent):
(QGraphicsWebView::mouseReleaseEvent):
(QGraphicsWebView::mouseDoubleClickEvent):
(QGraphicsWebView::keyPressEvent):
(QGraphicsWebView::keyReleaseEvent):
(QGraphicsWebView::dragLeaveEvent):
(QGraphicsWebView::dragMoveEvent):
(QGraphicsWebView::dropEvent):
(QGraphicsWebView::wheelEvent):
(QGraphicsWebView::inputMethodEvent):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Make the QGraphicsWebView constructor explicit.
* Api/qgraphicswebview.h:
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Last Qt 4.5 build fix (*sigh*)
* tests/qwebpage/tst_qwebpage.cpp:
(inputMethodHints): inputMethodHints() is only used for
Qt 4.6, so guard the whole function.
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Another prospective build fix against Qt 4.5 (build bot)
Don't compile & run the QGraphicsWebView portion of the
input methods auto test with Qt 4.5.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods_data):
(inputMethodHints):
(inputMethodEnabled):
(tst_QWebPage::inputMethods):
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Prospective build fix against Qt 4.5 (build bot)
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::setInputMethodEnabled): Guard the
use of Qt 4.6 specific API with #ifdefs.
2009-11-01 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
[Qt] Fix enabling of input method support on QGraphicsWebView.
https://bugs.webkit.org/show_bug.cgi?id=30605
Instead of setting the unsupported widget attribute on the
QGraphicsWidget in setInputMethodEnabled() set the
ItemAcceptsInputMethod GraphicsItem flag directly.
Changed the existing input method auto test to run once
on a QWebView and once on a QGraphicsWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::setInputMethodEnabled):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods_data):
(inputMethodHints):
(inputMethodEnabled):
(tst_QWebPage::inputMethods):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
Added QGraphicsWebView::modified property, for consistency
with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::isModified):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
Removed status and progress properties of QGraphicsWebView.
Added loadProgress and statusBarMessage signals instead,
after API review.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
(QGraphicsWebView::setPage):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
|
|
|
|
|
|
|
|
|
|
| |
Non-member operator allows implicit conversions on both arguments.
A single operator is enough to support QScopedArrayPointer,
QCustomScopedPointer and QScopedSharedPointer since equality semantics
don't change and the deleter is managed in the base class.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
| |
HTTP header names are case insensitive, but stick to what all browsers
etc. use to work around buggy servers.
Task-number: QTBUG-5618
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
|
|
|
|
| |
sub-src was iterating over SRC_SUBDIRS and not SUBDIRS. So, when the
tools were refactored out to handle distributed builds of host tools
with Electric Cloud, these tools were not included in the iteration.
Adding $$TOOLS_SUBDIRS to the recurse fixes this.
Also avoid setting dependencies for non-ordered builds
Reviewed-by: Jason McDonald
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QScriptDeclarativeClass is a private, but exported, class used by the
declarativeui module. It is very similar to QScriptClass, but slightly
faster and provides a couple of "backdoor" extension mechanisms used
by declarative.
Reviewed-by: Warwick Allison
|
| |
| |
| |
| | |
(cherry picked from commit d01db18696a7729b0d54af76f5224aed6750f3bb)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It appears that simply being in the scope chain of an existant frame
isn't sufficient to be marked. This can lead to a QScriptContext
scope chain that contains a JSObject that has been collected.
For example, this code:
QScriptContext *ctxt = engine->pushContext();
ctxt.pushScope(engine->newObject());
previouslyCreatedFunctionObject.call(); // causes a GC
can lead to the object added to the scope chain to have become
invalid. This leads to hilarity later on.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| |
| | |
If bytesReady() was called before start(), Div by Zero.
Added check for this condition.
Task-number:QTBUG-5300
Reviewed-by:Justin McPherson
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*
start()
Reviewed-by:Justin McPherson
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The view of a table gets reset if for example a query fails.
However this also resets and removes the Header views of the
table. A better solution visually is to keep them displayed.
Task-number: QTBUG-3162
|
| |
| |
| |
| |
| |
| |
| | |
This fixes painting artifacts on dock widgets. It would be nice to use
this attribute again once the painting is fixed.
Reviewed-by: trustme
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
instead than when parsing the cookie header.
This corrects the bug QT-2379, happening in the following sequence:
parseCookie -> setCookieUrl -> toRawForm -> parseCookie
where a default domain would now also have a dot prefix, and shouldn't.
QT-2379
Reviewed-by: Peter Hartmann
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Richard
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qwidget_win.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Andreas
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The option allows to disable native Windows7 gestures since they require the
creation of the native window handle. This partially disabled alien widgets
concept and make window resizing slower and more flickery.
Reviewed-by: Espen Riskedal
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When Windows doesn't support native gestures, we shouldn't create a native
winid. Also, there is no reason to create winid on all ancestors.
Reviewed-by: Trond
|
| | | | | |
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QPrintPreviewWidget wasn't following the Qt API naming convention of
*Count()/set*Count(). Introduce proper function, and obsolete the old.
Removed all usage of the old function in Qt.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QLCDNumber doesn't follow the API convention of *Count and set*Count().
Introduce properly named functions, and obsolete the old ones.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The name numCols is ambiguous, as sometimes it's refering to the number
of columns, and sometimes the number of colors. It also does not match
the typical Qt naming convention *Count().
Reviewed-by: Tom Cooksey
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
After an API review of the new math3d classes, the full name was
considered better than the short version. Therefore we obsolete the
short function, and introduce the longer version.
Reviewed-by: Andreas Aardal Hanssen
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We added the class QMargins, so we should use it wherever we deal with
margins, as a convenience to the users.
Reviewed-by: Andreas Aardal Hanssen
|
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
... was breaking symbian-abld build.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
After the refactoring to src/tools/tools.pro the dependencies for IDC
and UIC3 ended up being incorrect, due to the eval rules later in that
file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and
before ActiveQt, so the dependencies remain correct as before the
refactoring. The added condition of src/tools/tools.pro ensures that we
add the tools to the Makefile in src/tools, should we decide to generate
it, and compile from there.
Reviewed-by: Jason McDonald
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was a serious performance issue on Symbian and not necessarily
optimal on other platforms. For the time being, we'll allow the OS to
read/write as much as it can.
Otherwise cleaned up the code, adding checks for invalid len arguments.
Task-number: QT-2347
Reviewed-by: Peter Hartmann
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Configure.exe would simply initiate a build for each of the tools in
order. However, this would break certain distributed build systems,
since they would return right away after initiating the make. Thus,
sometimes moc et al. would try to link before bootstrap lib was built.
Reviewed-by: Jason McDonald
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting
forever for the thread to terminate, which did not always succeed due to
a Linux kernel bug. Now, we just wait for some time and then return
anyway.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-5296
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: TrustMe
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Declarative tripped these (crashes).
Reviewed-by:Aaron Kennedy
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
dist/changes-4.6.0
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Was reproducable with the example in
<QTDIR>\examples\dialogs\trivialwizard
You could not push the navigation buttons using the stylus.
Task-number: QTBUG-3613
Reviewed-by: thartman
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The old button sizes were just to big. For example the trivialwizard
example had a minimal width that was much too wide for the screen.
Task-number: QTBUG-3613
Reviewed-by: thartman
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Maurice
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Using operator[] can cause a deep copy if the container is not const.
Some of the containers were const, but I changed all of them to use at() since
its more Qt-style.
|