summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QDFBScreen bgcolor is only use in non_wm modeAnders Bakken2009-09-041-4/+4
| | | | | | | No need to carry those extra bytes around when QT_DIRECTFB_WM is defined. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Remove unused function in QDFBScreenAnders Bakken2009-09-042-6/+0
| | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Handle proxywidgets better in DFBAnders Bakken2009-09-041-21/+26
| | | | | | | | This code is roughly the same as in other screen drivers. We shouldn't flush widgets that are in a graphicsscene as a proxy widget. They will be handled by the graphicsview. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into qt46Espen Riskedal2009-09-0440-251/+690
|\
| * Fixed object rotations in the boxes demo.Kim Motoyoshi Kalland2009-09-042-11/+8
| | | | | | | | | | | | | | | | When Math3D was introduced, the boxes demo was changed to use the classes in the new module, but the change caused some bugs with the object rotations. This commit should fix them. Reviewed-by: Samuel
| * Make the example also work on a desktop with a dark theme.Thomas Zander2009-09-041-0/+1
| |
| * Updating line-numbers for linguist auto testsJoão Abecasis2009-09-0415-47/+52
| |
| * More fixes for qatomic_windows.hJoão Abecasis2009-09-041-22/+27
| | | | | | | | | | | | | | | | | | | | | | If platform headers have been included the Interlocked names may be macros and we end up with double underscores in our function names. By prefixing "Interlocked" and then the actual function names we work around that. Let's hope nobody redefines Interlocked or Increment and friends... :-) Reviewed-by: Prasanth Ullattil
| * Fixed tst_QFiledialog::filesSelectedSignal where the selected directory to runGabriel de Dietrich2009-09-042-1/+11
| | | | | | | | | | | | the test may not have any file on it. Reviewed-by: Olivier
| * Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-09-041-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added multiple frames to QPaintBuffer.Samuel Rødal2009-09-044-72/+74
| | | | | | | | | | | | | | | | | | This lets us stream a single QPaintBuffer instead of one QPaintBuffer per frame in the trace graphicssystem, which leads to not streaming pixmaps / images once per frame. Performance when doing a trace is also a lot better for painting heavy applications. Reviewed-by: Trond
| * Avoided streaming multiple copies of images/pixmaps in QPaintBuffer.Samuel Rødal2009-09-041-1/+74
| | | | | | | | | | | | This reduces the size of the trace files significantly in certain cases. Reviewed-by: Trond
| * Fix tst_QTimer::moveToThread() on WindowsBradley T. Hughes2009-09-042-5/+45
| | | | | | | | | | | | | | | | | | | | We shouldn't fully unregister timers when the event dispatcher is stopped when a thread exits, since this releases the timerId back to the pool. Instead, only free the OS resources. Auto-test included. Reviewed-by: ogoffart
| * Optimize qt_format_text test operations: try not to detachOlivier Goffart2009-09-041-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | Second try. This is a fixed version of the one reverted in commit 25014061b8de The difference is that it does text[offset] = QChar::LineSeparator; instead of chr = QChar::LineSeparator; Reviewed-by: Eskil
| * Fix crashes when moving descendents during destruction.Andreas Aardal Hanssen2009-09-042-7/+71
| | | | | | | | | | | | | | | | | | | | | | This fix prevents crashes in QGraphicsItem caused by calls to pure virtual functions as an item tries to access its dying parent. This happens when an item is moved by an ancestor during this ancestor's destructor. Autotests included. Reviewed-by: bnilsen
| * Don't call pure virtuals on deleting QGraphicsItemAaron Kennedy2009-09-041-1/+3
| | | | | | | | | | | | This also needs to be reviewed by andreas. Reviewed-by: Michael Brasser
| * Make the view in the flowlayout example big enough.Jan-Arve Sæther2009-09-041-0/+1
| |
| * Make sure that top-level windows respect hfw/wfh constraint.Jan-Arve Sæther2009-09-043-25/+230
| | | | | | | | | | | | | | | | | | | | Note that the constraint is only enforced when resizing the window interactively. Calling setGeometry() will not try to enforce the constraint. See the graphicsview/flowlayout example for a "manual test". Task-number: 257455
| * QGraphicsWidget::sizeHint didn't pass the correct constraint to layout.Jan-Arve Sæther2009-09-041-2/+4
| | | | | | | | | | Adjust the constraint with the widget margin before passing it on to d->layout->effectiveSizeHint().
| * Minor fixes to the graphicsview/flowlayout exampleJan-Arve Sæther2009-09-042-13/+17
| |
| * Remove implicit margin on bulleted lists when exporting to HTMLEskil Abrahamsen Blomfeldt2009-09-042-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When we export a bulleted list to HTML, we add a meta-block around the list items to set the bullet style of the list (<ul> or <ol>.) This block will implicitly have a margin, even if the list itself does not in the internal document. The result is that exporting a list to HTML and then reloading it will give a different apperance, because the 0 margin of the original was not saved. The fix is to always set the meta-block's margin to 0, since it is only there to set the bullet style and should not affect the layout at all. Task-number: 201228 Reviewed-by: Simon Hausmann
* | Added Symbian to our list of Tier1 platformsEspen Riskedal2009-09-041-0/+2
|/ | | | | | | | At the moment we only support S60 3.1, 3.2 and 5.0. Once Symbian Platforms actually gets publicly released we'll add those too. Reviewed-by: Volker Hilsheimer Reviewed-by: Jason Barron
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-04677-5812/+12440
|\
| * 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*.