summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make QGLFramebufferObject::isBound() check it is the bound fboTom Cooksey2009-09-041-5/+3
| | | | | | | | Previously, it was possible that painting using QPainter to a different GL target (E.g. QGLWidget) would unbind the FBO. In such cases, isBound returned true, even though the FBO wasn't bound to any context. Reviewed-by: Samuel
* Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | On 10.5 and below the pixmap data bytes happened to be initialized by malloc, on 10.6 this is no longer the case. Revby: Gunnar Sletta <gunnar@trolltech.com> Similar to 28f94e1ef94f.
* %SystemDrive% folder created in current directory on Windows 7.Prasanth Ullattil2009-09-041-3/+4
| | | | | | | | | | | This happens only when the standarddialogs demo is run from qtdemo. On Windows 7, calling the GetOpenFileName() caches something in %SystemDrive%\ProgramData\Microsoft\Windows\Caches. qtdemo was removing all environment variables other than PATH for the child processes. This caused the example to dump the cache in current directory instead. Task-number: 260898 Reviewed-by: Jens Bache-Wiig
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-04303-4888/+2936
|\
| * Slightly improved QGLFramebufferObjectFormat API.Samuel Rødal2009-09-045-21/+22
| | | | | | | | | | | | | | Renaming setInternalFormat() to setInternalTextureFormat() (and similarly for the accessor) makes the API a bit more explicit. Reviewed-by: Trond
| * QAbstractSocket: Missing initializationsMarkus Goetz2009-09-042-1/+5
| |
| * QHostInfoPrivate: Uninitialized intMarkus Goetz2009-09-041-2/+3
| |
| * QNetworkAccessManager: Missing break in proxyAuthenticationKeyMarkus Goetz2009-09-041-0/+1
| | | | | | | | | | | | | | This probably made the proxy authentication saving for ftp proxies not working. Reviewed-by: Thiago
| * Stylesheet: Do not crop the text in tabsOlivier Goffart2009-09-043-2/+114
| | | | | | | | | | | | | | | | | | | | | | | | Because we did not reiimplement SE_TabBarTabText to force the parentstyle to call the virtual function back, we got the normal style margins in addition to the one by the stylesheet. Also added test for !hasNativeBorder to suport cases where we just specify a border Reviewed-by: jbache Task-number: 196326
| * Fix the QStyleSheet test with pulse.Olivier Goffart2009-09-041-1/+2
| | | | | | | | | | | | | | The windows manager was moving the window behind our back, making the test fails sometimes Reviewed-by: Thierry
| * Fix ./tst_qdatetimeedit::task118867Olivier Goffart2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Before the QLineEdit change, the QLineEdit::displayText used to return the currently entered text when we call validate() on the validator. Now, the displayText is set _after_ the validation. Hence, the QDateTimeEdit::validate did not had access to the real text. Reviewed-by: Thierry
| * define MAP_ANON as MAP_ANONYMOUS on HPUXKent Hansen2009-09-041-0/+3
| | | | | | | | Reviewed-by: Simon Hausmann
| * Prospective SunCC compile fixSimon Hausmann2009-09-041-1/+1
| | | | | | | | | | | | Call the QScriptValue constructor without class scope. Reviewed-by: Trust me
| * Add a way of getting the stack base on HP-UX.Thiago Macieira2009-09-041-0/+45
| | | | | | | | | | | | | | | | | | Unfortunately, HP-UX's pthread doesn't allow us to get the stack address of a running thread. We have to suspend the thread. And obviously we can't suspend ourselves. The solution is to start another thread, which suspends us, gets the stack address, and resumes.
| * Add PLATFORM(HPUX) and COMPILER(ACC) defines, for HP-UX support.Thiago Macieira2009-09-041-0/+24
| | | | | | | | | | | | | | | | | | Also add PLATFORM(IA64) and PLATFORM(HPPA), though we don't use them and probably don't need. Just in case. Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
| * Fix compilation on AIX: struct tm has no timezone information.Simon Hausmann2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 113.42: 1540-0217 (S) "tm_gmtoff" is not a member of "struct tm". "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 115.37: 1540-0217 (S) "tm_zone" is not member of "struct tm". Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h
| * Implement support for getting the stack base on AIX.Thiago Macieira2009-09-041-0/+12
| |
| * Fix compilation with xlC 7: operator-> must return a pointer-like type.Thiago Macieira2009-09-041-1/+1
| | | | | | | | "webkit/JavaScriptCore/runtime/Protect.h", line 101.17: 1540-1196 (S) The return type cannot be "JSC::JSValue" because "class JSValue" does not have an "operator->" function.
| * Work around an apparent xlC 7 bug: partial specialisation on HashMap.Thiago Macieira2009-09-041-49/+54
| | | | | | | | | | | | | | | | This problem was appearing only in the functions in the HashMap partial specialisation for Ref<T> that returned std::pair<iterator, bool>. "/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/RefPtrHashMap.h", line 205.5: 1540-1174 (S) The member "template std::pair<HashMap<RefPtr<T>,U,V,W,X>::iterator,bool> inlineAdd(const KeyType &, const MappedType &)" is not declared as a template in its containing class definition.
| * Fix compilation with xlC 7: apparently problem with nested templates.Thiago Macieira2009-09-041-20/+20
| | | | | | | | 1540-0062 (S) The incomplete class "IsConvertibleToDouble<0, char>" must not be used as a qualifier.
| * Fix compilation with Sun CC 5.9: std::pair does not call types' constructors.Thiago Macieira2009-09-041-4/+4
| | | | | | | | Error: Could not find a match for WTF::HashMap<std::pair<WTF::RefPtr<JSC::UString::Rep>, unsigned>, JSC::Structure*, JSC::StructureTransitionTableHash, JSC::StructureTransitionTableHashTraits, WTF::HashTraits<JSC::Structure*>>::remove(std::pair<JSC::UString::Rep*, unsigned>) needed in JSC::Structure::~Structure().
| * Fix compilation with Sun CC 5.9: the default constructor for ↵Thiago Macieira2009-09-043-5/+23
| | | | | | | | | | | | HashTableIteratorAdapter isn't called. "../JavaScriptCore/wtf/RefPtrHashMap.h", line 208: Error: Cannot use std::pair<WTF::HashTableIterator<WTF::RefPtr<JSC::UString::Rep>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>, WTF::PairFirstExtractor<std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, WTF::StrHash<WTF::RefPtr<JSC::UString::Rep>>, WTF::PairHashTraits<WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>, WTF::HashTraits<StaticValueEntry*>>, WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>>, bool> to initialize std::pair<WTF::HashTableIteratorAdapter<WTF::HashTable<WTF::RefPtr<JSC::UString::Rep>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>, WTF::PairFirstExtractor<std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, WTF::StrHash<WTF::RefPtr<JSC::UString::Rep>>, WTF::PairHashTraits<WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>, WTF::HashTraits<StaticValueEntry*>>, WTF::HashTraits<WTF::RefPtr<JSC::UString::Rep>>>, std::pair<WTF::RefPtr<JSC::UString::Rep>, StaticValueEntry*>>, bool>.
| * Fix linking with Sun CC 5.9: function pointers for extern "C" are treated ↵Thiago Macieira2009-09-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | differently The Sun CC compiler treats C functions and C++ functions differently, as if they had a different calling sequence (they don't, but they could). So if you declare a function in C++ having a function pointer as a parameter, it's understood to be C++ even if it had previously been declared as extern "C". This could be a compiler error, though. In any case, the end result is that WebKit fails to link because of an undefined reference to NPN_PluginThreadAsyncCall. "plugins/npapi.cpp", line 177: Warning (Anachronism): Formal argument 2 of type void(*)(void*) in call to WebCore::PluginMainThreadScheduler::scheduleCall(_NPP*, void(*)(void*), void*) is being passed extern "C" void(*)(void*). There are more of these errors left in WebKit, but they are not causing problems right now.
| * Fix compilation with Sun CC 5.9: ambiguity in ?:Thiago Macieira2009-09-0416-20/+20
| | | | | | | | | | | | | | | | | | | | Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<WebCore::DocumentFragment>" and third operand of type "int" can be converted to one another. Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<JSC::Label>" and third operand of type "int" can be converted to one another. [and others similar] Conflicts: src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp
| * Remove comma at end of enum. Some compilers are more picky than others.Thiago Macieira2009-09-0419-20/+21
| | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h
| * Fix compilation with Sun CC 5.9: moving elements in a vector requires source ↵Thiago Macieira2009-09-041-6/+6
| | | | | | | | | | | | | | | | | | | | not to be const I don't know why the compiler couldn't call src->~T() on a const T *src, but fact is it couldn't. In any case, since move is copying the source and deleting it, formally the argument shouldn't be const anyway.
| * Fix compilation error on Solaris: mmap/munmap take/return a char*, not void*.Thiago Macieira2009-09-042-3/+3
| | | | | | | | | | | | "../JavaScriptCore/interpreter/RegisterFile.h", line 128: Error: Using static_cast to convert from char* to JSC::Register* not allowed. Error: Formal argument 1 of type char* in call to munmap(char*, unsigned) is being passed JSC::Register*.
| * Fix linking with SunCC 5.9: de-inline the operator new and delete in ↵Thiago Macieira2009-09-042-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParserArenaDeletable. If you mark functions as "inline", the compiler doesn't have to emit out-of-line copies. What happens is that Nodes.h declares these functions, but the inline bodies are in NodeConstructors.h. ParserArena.cpp used these functions, but didn't include NodeConstructor.h. I could have added the missing #include, but this is error-prone, since you have to remember to do that. Moving the bodies into Nodes.h was also not possible, because it requires JSC::Parser to be defined and Parser.h needs to #include "Nodes.h". So the solution is to de-inline.
| * Fix oversize-buffer support for aligning.Thiago Macieira2009-09-041-3/+8
| | | | | | | | Since Vector initialises VectorBase with the value of inlineBuffer(), it does so before the m_inlineBuffer member has had a chance to initialise. This lead to dereferencing of uninitialised pointers and, as was expected, crashes.
| * Doc: Review of docs for QGraphicsItem::ItemUsesExtendedStyleOption.Geir Vattekar2009-09-041-7/+11
| | | | | | | | | | Task-number: 253733 Reviewed-by: Bjørn Erik Nilsen
| * Fixed once-in-a-while failing tst_QGraphicsItem::selected test.Gabriel de Dietrich2009-09-042-3/+6
| | | | | | | | | | | | Added event information in QTest::mouse* warning message. Reviewed-by: Olivier
| * fix text eliding for arabic and syriacLars Knoll2009-09-041-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Arabic and Syriac are connected scripts where the letter shape changes depending on the context. Text eliding should not affect that letter shape if the truncation happens in the middle of a word. The patch ensures that by adding a Unicode ZWJ character between the text and the eliding in case the character would connect in the full string. Reviewed-by: Simon Hausmann
| * qtdemo now accept the -verbose option as specified in the help output.Denis Dzyubenko2009-09-041-0/+2
| | | | | | | | Reviewed-by: trustme
| * Small corrections in the documentationBradley T. Hughes2009-09-041-2/+2
| | | | | | | | | | 1. "is is" -> "it is" 2. remove excess use of the work "unexpected"
| * tst_QLocalSocket::writeToClientAndDisconnect addedJoerg Bornemann2009-09-041-0/+30
| | | | | | | | | | | | | | | | | | In this test case the server writes data to the client and disconnects at once. After this, the client socket must still be able to read the data and then close itself. Task-number: 260631 Reviewed-by: phartman
| * fix disconnect-after-write-problem in QLocalSocket on WindowsJoerg Bornemann2009-09-042-11/+34
| | | | | | | | | | | | | | | | | | If the server disconnects directly after writing its data, like the localfortuneserver example does, we must close the reading client socket. Before this patch, an error was yielded. Task-number: 260631 Reviewed-by: phartman
| * qapplication_win.cpp compile fix for Q_WS_WINCE_WMJoerg Bornemann2009-09-041-1/+0
| | | | | | | | Reviewed-by: TrustMe
| * Added a phonon dependency to webkitDenis Dzyubenko2009-09-041-1/+1
| | | | | | | | | | | | We need to make sure phonon is built before webkit. Reviewed-by: Tor Arne
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-04102-3148/+114
| |\
| | * Generate Q_UNUSED(varName) only when varName was not used in ↵Jarek Kobus2009-09-04102-3148/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | retranslateUi(Class varName) method. Autotests for uic updated accordingly Task: 260784 RevBy: Kai Koehne <kai.koehne@nokia.com>
| * | Fix license headersJason McDonald2009-09-044-0/+60
| |/ | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-0441-71/+525
| |\
| | * Fixed clipping of native style elements when raster is used on macGunnar Sletta2009-09-041-2/+6
| | | | | | | | | | | | Reviewed-by: Trond
| | * Add license headers to .l files.Jason McDonald2009-09-042-0/+82
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Add license headers to python codeJason McDonald2009-09-049-2/+368
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Remove license header as Solaris X86 assembler can't digest comments.Jason McDonald2009-09-041-40/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-041-0/+6
| | |\
| | * | Pedantic fixes for license headers.Jason McDonald2009-09-0428-27/+69
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fixed autotest failure in qwidget on X11 with Oxygen style.Samuel Rødal2009-09-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oxygen draws a fancy background gradient etc so it's not suitable for this kind of pixel testing. Since we're testing the window surface and not the style just use the simple QWindowsStyle here. Reviewed-by: Gunnar Sletta
| * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0434-776/+957
| |\ \ \
generated by cgit v0.12 at 2024-11-16 06:41:26 (GMT)