summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtwebkit-4.6' into osloStaging1-4.6Jocelyn Turcotte2009-11-1215-26/+236
|\
| * Re-apply change 945e079e60506e88435802d0a764c8b4121ad16f by Richard Moe ↵Richard Moe Gustavsen2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gustavsen BT: JavaScriptCore makes applications crash on leopard 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
| * Re-apply change f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 by Joerg BornemannJoerg Bornemann2009-11-122-1/+6
| | | | | | | | | | | | | | | | | | fix WebKit build on Windows CE 6 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
| * Re-apply change a6123418522a3865d462cb64022f567462603af1 by Thiago MacieiraThiago Macieira2009-11-121-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago Macieira 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 d09f0e3949d4e705ef60516a9ccfacad736dff43 by Thiago MacieiraThiago Macieira2009-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | Re-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago Macieira 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 d0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 by David BoddieDavid Boddie2009-11-122-7/+91
| | | | | | | | | | | | | | | | Re-apply change 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David Boddie 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
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( ↵Jocelyn Turcotte2009-11-1217-159/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 361c6ae17415602fedcce8924de445feafaddebb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-11 Liang QI <liang.qi@nokia.com> [Qt] Fix tst_qwebpage and tst_qwebframe compilation on Symbian. * tests/qwebframe/qwebframe.pro: * tests/qwebframe/tst_qwebframe.cpp: * tests/qwebpage/qwebpage.pro: * tests/qwebpage/tst_qwebpage.cpp: 2009-11-11 Kenneth Rohde Christiansen <kenneth@webkit.org> Reviewed by Simon Hausmann. Fix a crash in the layout test plugins/document-open.html * Api/qwebframe.cpp: (QWebFrame::toPlainText): 2009-11-11 Warwick Allison <warwick.allison@nokia.com>, Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. [Qt] Regression: Preserve the parent of plugin objects when using QtWebKit with only a QWebPage. * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::createPlugin): Don't reparent plugins to 0. * tests/qwebpage/tst_qwebpage.cpp: (PluginCounterPage::PluginCounterPage): Initialize m_pluginParent to 0. (PluginCounterPage::~PluginCounterPage): Delete the plugin parent later (after the page) (PluginTracerPage::createPlugin): Assign a dummy parent to the plugin. (PluginTracerPage::PluginTracerPage): Set up the plugin parent. (tst_QWebPage::createViewlessPlugin): Verify that for viewless pages the plugin parent remains unchanged. 2009-11-11 David Boddie <dboddie@trolltech.com> [Qt] Doc: Added internal or hidden placeholder documentation. * Api/qwebpage.cpp: 2009-11-11 Martin Smith <msmith@trolltech.com> [Qt] doc: Changed Trolltech to Nokia * Api/qwebview.cpp: 2009-11-10 Kenneth Rohde Christiansen <kenneth@webkit.org> Unreviewed documentation fixes. Added a few improvements from Jocelyn Turcotte to the createWindow docs. * Api/qwebview.cpp: 2009-11-10 Kenneth Rohde Christiansen <kenneth@webkit.org> Unreviewed documentation fix. [Qt] Make qwebpage's createWindow not qwebview dependent. https://bugs.webkit.org/show_bug.cgi?id=30771 Update documentation to make it clear that a reimplementation of the createWindow method of the associated QWebPage can result in the QWebView::createWindow method to never be called. * Api/qwebview.cpp: 2009-11-11 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Fix enabling of software input panel when activating editable elements in QGraphicsWebView. * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::inputMethodEnabled): Implement method to query for input method support. * Api/qwebpage.cpp: (QWebPageWidgetClient::inputMethodEnabled): Ditto for QWidget. (QWebPagePrivate::handleSoftwareInputPanel): Don't use view() to test for input method support. Instead query using QWebPageClient and send the SIPR event to the ownerWidget() instead of the view(). The latter is null for QGraphicsWebView. * tests/qwebpage/tst_qwebpage.cpp: (EventSpy::EventSpy): (EventSpy::eventFilter): (tst_QWebPage::inputMethods): Modify the test to verify that SIPR events are dispatched when activating focusable content.
| * Make README more accurate for Mac OS X.Jason McDonald2009-11-121-4/+8
| | | | | | | | Reviewed-by: Richard Moe Gustavsen
* | Cocoa: QColorDialog makes the application hangRichard Moe Gustavsen2009-11-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that the color dialog is using a native dialog. And this dialog enters modality on its own, bypassing the modality mechanism in Qt. Most important, when the dialog leaves modality, it does so by calling [NSApp stopModal]. And this call stops all modal sessions in the application, including the ones owned by Qt. This patch detects when this situation occurs, and makes sure that all modal sessions gets stopped the correct way, and later rebuilt. Rev-By: MortenS
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-12226-22307/+23870
|\ \ | |/
| * Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | | | | | | | Reviewed-by: TrustMe
| * Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| | | | | | | | Reviewed-by: TrustMe
| * Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| * Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| | | | | | | | | | | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
| * Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| | | | | | | | | | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| * gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| | | | | | | | | | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
| * Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| | | | | | | | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| * reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| | | | | | | | | | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| * gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
| * Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| | | | | | | | Reviewed-By: TrustMe
| * Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| | | | | | | | | | | | | | | | r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line forwardport: two more adaptor accesses where adaptor might be 0 Reviewed-by: Justin McPherson
| * Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| | | | | | | | | | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson
| * Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| | | | | | | | | | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
| * Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson
| * Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | | | | | | | Fixes: QTBUG-5167
| * Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-112-11/+24
| |
| * Changes file updatedaavit2009-11-111-0/+2
| |
| * doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| |
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-1143-20848/+21472
| |\
| | * Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | |
| | * qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| | * qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| | * qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| | * Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| | * Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
| | |\
| | * \ Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11280-2839/+5756
| | |\ \
| | * | | fix tst_qdatastream for Windows CEJoerg Bornemann2009-11-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SRCDIR is empty on Windows CE, so it doesn't make sense to prepend a slash. No other autotest does this. Also, we must deploy test2.svg. Reviewed-by: thartman
| | * | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | * | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-096-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | tst_largefile.cpp Windows CE compile fixJoerg Bornemann2009-11-092-4/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | * | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
| | * | | tst_qlistwidget compile fix for Qt without RTTIJoerg Bornemann2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | * | | tst_qcombobox: compile without Qt3 supportJoerg Bornemann2009-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Update the translations of Qt AssistantBenjamin Poulain2009-11-111-221/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the new translations for the string added by 500e71ab649a5053667ff3f9dc7d87730b565756 Update some translations
| * | | | Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| | | | |
| * | | | Validate the translation of Qt_help by PierreBenjamin Poulain2009-11-111-67/+67
| | |/ / | |/| |
| * | | Autotest: fix compiling after qscopedpointer.h changed.Thiago Macieira2009-11-111-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCustomScopedPointer was moved to a private header since it's only a helper class. QScopedSharedPointer wasn't necessary since it can be replaced with QSharedDataPointer neatly. Reviewed-by: Jesper Thomschütz
| * | | Fixed QGraphicsEffectSource autotest after graphics effect API changes.Samuel Rødal2009-11-111-30/+20
| | | |
generated by cgit v0.12 at 2025-08-25 19:55:36 (GMT)