| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
The uic.h/cpp files exist in duplicate due to QDomDocument
being used in uic3 and QXmlStreamReader in uic.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| |
|
|
| |
Reviewed-by: owolff
|
| |
|
|
|
|
|
|
|
|
|
| |
The border was not showing up because the last row was missing cells if
the number of classes is not perfectly dividable by the number of
columns.
This patch makes sure that empty cells are generated so the CSS can
style them.
Reviewed-by: Martin Smith <msmith@trolltech.com>
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
tools/configure/configureapp.cpp
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qscopedpointer.h
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
JavaScriptCore checks the Mac OS version when building, and uses
symbols only defined in i e.g.snow leopard when building on snow
leopard.
This means that if you build Qt on snow leopard and later move
it to leopard, applications will crash looking for a missing
symbol (pthread_setname_np in particular).
In Qt, we garuantee that you can run your applications on 10.4 and up
for Carbon, and 10.5 and up for Cocoa. So using compile time checks
this way is not a proper soulution.
Result: In Qt, never use symbols not defined on all supported OS
versions, or at least implement run-time checks.
Rev-By: Simon Hausmann
Rev-By: Tor Arne
Rev-By: MortenS
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Again, we have fun with the C time functions on Windows CE.
On Windows CE 5: the functions are declared but not defined.
On Windows CE 6: the functions are neither declared nor defined.
Reviewed-by: Simon Hausmann
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update changes-4.6.0 with relevant changes.
Reviewed-by: Trond
Conflicts:
dist/changes-4.6.0
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Also reorganise some things I saw wrong.
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
API review: Rename functions numColors(), setNumColors() and numBytes()
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg Bornemann
Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg Bornemann
WebKit compile fix for Windows CE
Not sure if this is right fix.
We could also disable PLUGIN_PACKAGE_SIMPLE_HASH.
But this is automatically enabled when NETSCAPE_PLUGIN_API is
disabled.
Reviewed-by: thartman
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane Kearns
Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane Kearns
Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850
This version of the fix will set the def file only if defblock is enabled
in qbase.pri. That means that def files don't get turned on for webkit
but not for the whole project (avoids build failures in the continuous
integration system when other teams change the exported symbols)
Reviewed-by: Jason Barron
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David Boddie
Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David Boddie
Doc: Added internal or hidden placeholder documentation.
Reviewed-by: Trust Me
To-be-completed-by: QtWebKit developers
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-apply change 7293097060383bcb75ee9f3e6a270de3b5bee2dc by Thiago Macieira
Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago Macieira
Implement symbol hiding for JSC's JIT functions.
These functions are implemented directly in assembly, so they need the
proper directives to enable/disable visibility. On ELF systems, it's
.hidden, whereas on Mach-O systems (Mac) it's .private_extern. On
Windows, it's not necessary since you have to explicitly export. I
also implemented the AIX idiom, though it's unlikely anyone will
implement AIX/POWER JIT.
That leaves only HP-UX on PA-RISC unimplemented, from the platforms
that Qt supports. It's also unlikely that we'll imlpement JIT for it.
Reviewed-by: Kent Hansen
(this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was
lost during a WebKit update)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago Macieira
Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago Macieira
Fix linking of WebKit on Linux 32-bit.
It was missing the ".text" directive at the top of the file,
indicating that code would follow. Without it, the assembler created
"NOTYPE" symbols, which would result in linker errors.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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):
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
... to also test QScopedArrayPointer, QCustomScopedPointer and
QScopedSharedPointer.
Added one level of indirection to comparison test case to avoid
double-delete in case of test failure. The test also tests other aspects
of Q*Scoped*Pointer behavior.
Reviewed-by: Olivier Goffart
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
