summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add my changes to the 4.6.0 changelog.Bradley T. Hughes2009-11-101-2/+56
| |
* | Added my changes in Qt 4.6.0 to the change log.Kim Motoyoshi Kalland2009-11-101-2/+5
| |
* | Added my changelog entries.axis2009-11-101-0/+5
| |
* | Add some of my changes to changes-4.6.0Eskil Abrahamsen Blomfeldt2009-11-101-1/+44
| | | | | | | | | | | | | | | | | | | | Update changes-4.6.0 with relevant changes. Reviewed-by: Trond Conflicts: dist/changes-4.6.0
* | Added my changes to changes-4.6.0.Kim Motoyoshi Kalland2009-11-101-0/+23
| |
* | Changelog: My changes.Thiago Macieira2009-11-101-15/+58
| | | | | | | | Also reorganise some things I saw wrong.
* | Updated changelog with my changesBenjamin Poulain2009-11-101-0/+15
| |
* | Richards changes into the changelogRichard Moe Gustavsen2009-11-101-0/+17
| |
* | Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-OlsenMarius Storm-Olsen2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg BornemannJoerg Bornemann2009-11-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane KearnsShane Kearns2009-11-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David BoddieDavid Boddie2009-11-101-0/+17
| | | | | | | | | | | | | | | | 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 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago MacieiraThiago Macieira2009-11-101-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago MacieiraThiago Macieira2009-11-101-1/+2
| | | | | | | | | | | | | | | | | | 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 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David BoddieDavid Boddie2009-11-102-7/+91
| | | | | | | | | | | | | | 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 b065fda13c29110fc81f77c9bbf1069d562b4d67 by Martin SmithMartin Smith2009-11-101-1/+1
| | | | | | | | | | | | | | 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 fdb9419f23d1cd2a9ddfc1f7e2fb58f6e845483b by Jocelyn TurcotteJocelyn Turcotte2009-11-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QILiang QI2009-11-104-2/+10
| | | | | | | | | | | | Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QI Fix tst_qwebpage and tst_qwebframe compilation on Symbian. RevBy: TrustMe
* | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( ↵Jocelyn Turcotte2009-11-1024-390/+598
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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):
* | Extending QScopedPointer test caseJoão Abecasis2009-11-101-17/+139
| | | | | | | | | | | | | | | | | | | | | | ... 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
* | Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| | | | | | | | | | | | | | | | | | | | 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
* | My changes for 4.6.0Paul Olav Tvete2009-11-101-0/+10
| |
* | QNAM HTTP Code: Start authorization header with capital letterMarkus Goetz2009-11-101-2/+2
| | | | | | | | | | | | | | | | 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
* | Updated changelog with my changesTom Cooksey2009-11-101-0/+33
| |
* | Fix failing sub-src targetMarius Storm-Olsen2009-11-102-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Update change log with multimedia changes.Andrew den Exter2009-11-101-0/+6
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-11-1011-7/+873
|\ \
| * | update changelogDerick Hawcroft2009-11-101-0/+3
| | |
| * | update dist/changes-4.6.0Bill King2009-11-101-0/+25
| | |
| * | Add QScriptDeclarativeClassAaron Kennedy2009-11-109-6/+826
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | added missing include for template instantiation (in qDeleteAll)mae2009-11-101-1/+1
| | | | | | | | | | | | (cherry picked from commit d01db18696a7729b0d54af76f5224aed6750f3bb)
| * | During a GC mark the scope chain of QScriptContextsAaron Kennedy2009-11-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | If bytesReady() was called before start(), Div by Zero. Added check for this condition. Task-number:QTBUG-5300 Reviewed-by:Justin McPherson
* | | Changes to low-level audio API.Kurt Korbatits2009-11-1040-249/+267
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Changes to low-level audio API.Kurt Korbatits2009-11-1040-270/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-10464-4690/+11221
|\ \
| * | Don't reset view if a query fails.Derick Hawcroft2009-11-101-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Dont set DontCreateNativeAncestors attribute.Denis Dzyubenko2009-11-091-1/+0
| | | | | | | | | | | | | | | | | | | | | This fixes painting artifacts on dock widgets. It would be nice to use this attribute again once the painting is fixed. Reviewed-by: trustme
| * | Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-095-33/+46
| |\ \
| | * | QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-094-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually only a workaround of what seems to be a QtWebKit bug. See QTBUG-4649. Reviewed-by: Jedrzej Nowacki
| * | | Update INSTALL and README + friends for the everywhere packageJason McDonald2009-11-106-391/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make INSTALL and README more generic, avoid repeating stuff that's already in the product docs, and move the Windows Signing stuff into the product docs. Task-number: QTBUG-5453 Reviewed-by: Espen Riskedal
| * | | Doc: updated documentation for Google Suggest ExampleMorten Engvoldsen2009-11-091-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented the Google Suggest Example. Adding descriptions and screenshot. and correcting indent Task-number: QT-700 Rev-by: Volker Hilsheimer
| * | | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-0912-11/+42
| |\ \ \
| | * | | Fixed pan gesture handlers in standard Qt widgets.Denis Dzyubenko2009-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-09193-2069/+5368
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_win.cpp
| | * | | | Improved xsync feature testing.Denis Dzyubenko2009-11-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we actually call any XSync function to test if those functions are available on the platform. On HPUX there is something wrong since X11 header files contain required function declarations, however we cannot link to them. Reviewed-by: Andreas
| | * | | | Fixes compilation warning in qbrushDenis Dzyubenko2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas
| | * | | | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-067-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Dont create native winid when not required.Denis Dzyubenko2009-11-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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