summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-2710-10/+56
| | | | | | | | | | | | only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
* QLibrary on Windows: Do not show error boxes when library load failsPeter Hartmann2009-10-271-0/+3
| | | | | | | | | When loading a library fails, the error message "The application or DLL ... is not a valid Windows image. Please check this against your installation diskette." is shown, which is not very helpful. Task-number: QT-2357 Reviewed-by: Marius Storm-Olsen
* QDom: make tests fail only on WindowsPeter Hartmann2009-10-261-0/+2
| | | | Reviewed-by: Carlos Duclos
* Merge commit 'origin/4.6' into core-4.6Peter Hartmann2009-10-261641-47823/+102396
|\
| * Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-10-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * Fix linking of WebKit on Linux 32-bit.Thiago Macieira2009-10-261-1/+2
| | | | | | | | | | | | 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.
| * Fixed typo in configure usage (superfluous hyphen).Erik Verbruggen2009-10-261-1/+1
| | | | | | | | Reviewed-by: Thiago Macieira
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-261500-16350/+43625
| |\
| | * Suppress warnings in QtOpenGL codeRhys Weatherley2009-10-263-1/+5
| | |
| | * Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
| | |
| | * Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
| | |
| | * Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-262-47/+134
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Fix ifdef around QMatrix4x4::rotate(QQuaternion)Rhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-264-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | Previous code was creating a full 3D rotation matrix and then projecting back to 2D. This change combines the two steps into one to avoid calculating matrix components that will be dropped. Reviewed-by: Sarah Smith
| | * Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Fix a crash in shutdown of QGraphicsEffectRhys Weatherley2009-10-251-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute locations must be bound before a shader program is linked according to the GLSL specification. Issue a warning to the user if they do it in the wrong order, which should help to isolate hard to find bugs much quicker. Reviewed-by: trustme
| | * Add an extra overload for QMatrix4x4::toTransform()Rhys Weatherley2009-10-254-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 100afe8d fixed a bug in QGraphicsRotation related to when the "distance to plane" projection needed to be performed. As a side effect it made the toTransform() API not do the expected thing when the function is called with no argument. This change makes the default no-argument version of toTransform() do the simple "drop row 3 and column 3" orthographic transformation that normal users of the class expect, and adds a new overload for the "distance to plane" projection case for the special case. Reviewed-by: trustme
| | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-233-29/+6
| | |\
| | | * QWidget painting regression on Windows.Bjørn Erik Nilsen2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occurred on Windows due to a call to repaint() on a top-level window from setDisabledStyle() in qwidget.cpp. This function is called whenever a window is blocking. In this particular case the children of the repainted window are opaque, and should therefore not be repainted, which also means that the top-level have to subtract the region of the opaque children when filling the background. This region is cached, and the problem was that the cached region was wrong. It was wrong because it was not invalidated properly. Task: QTBUG-4245 Reviewed-by: Paul
| | | * QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background color of PE_Frame was palette().light() and has been changed to use palette().background() now. This fixes the autotest tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile. Reviewed-by: thartman
| | | * move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-222-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original approach of modifying the font for QAbstractButtons in QWindowsMobileStyle::polish broke the autotest tst_qstylesheetstyle::fontPropagation. Reviewed-by: thartman
| | * | Compile on QWSAnders Bakken2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 04d18b38c38c5ff623b30366ea08d56128b9b7d0 Qt didn't compile for QWS. Will email original committer to verify that original intent is maintained. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Add cross compiling pkg-config disabled warningDonald Carr2009-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically silently disabled pkg-config when cross compiling in order to avoid host pkg-config contamination of the target build. pkg-config files are present on many embedded targets, and make the correct detection/configuration of dependencies far more convenient for the developer. It is therefor valuable to advertise that pkg-config functionality is available but disabled barring direct involvement on their parts, rather than silently disabling it. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | QT_NO_CURSOR build fix on windows. Random corrections for it on mac.Jocelyn Turcotte2009-10-235-1/+11
| | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * | Correct line ending chars imported from webkit.Jocelyn Turcotte2009-10-232-107/+107
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Line spacing fixesJoerg Bornemann2009-10-2327-65/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit (via QTextLayout) and QPlainTextEdit in Qt used to ignore any font leading but added one extra pixel in QFontMetrics. With many freetype fonts, this resulted in a "spacy" text layout. The necessary fixes on X11 and Windows were to take (positive) leading into account, to make the font database convert point sizes to pixel sizes without rounding to plain integer values, and to subtract the extra pixel from QFontMetrics from the font engines' descent value. The change also fixes several places in styles and widgets, where QFontMetrics::lineSpacing() was wrongly used instead of QFontMetrics::height(). Ideally we should also handle negative leading, which would require additional and bigger code changes in QTextLayout and QPlainTextEdit. In addition, all other editors we have tested seem to ignore leading on X11. If we choose to believe the values provided by freetype, our text layout would be one pixel smaller than everybody else's. On the Mac, this change does nothing. There our layout is still too spacy, and for smaller fonts quite ugly compared to native Mac applications. Done with mae. Reviewed-by: mae
| | * | Doc: Fixed and synchronized QWebView related documentation.David Boddie2009-10-232-7/+91
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Updated the modules for the "Desktop" (Full Framework) edition.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Updated an external link.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Changed the text slightly.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-234-14/+72
| | | | | | | | | | | | | | | | They works just like the \qmlsignal and \qmlmethod commands.
| | * | Doc: Reviewed and revised QGraphicsAnchorLayout documentation.David Boddie2009-10-235-59/+216
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Mac: remove obvious commentRichard Moe Gustavsen2009-10-231-1/+0
| | | | | | | | | | | | | | | | Amending the previous merge request
| | * | Fix weird behavior when opening a QFileDialog for non-current directory.Andreas Kling2009-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldShowFileName() can be called with an empty filename, but must not create and use a QFileInfo("") since that has known undefined behavior. So just return NO right away for empty filenames. Merge-request: 1765 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | * | Inline QtScript exception helper functionsKent Hansen2009-10-233-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::toNumber() ~50% faster. Reviewed-by: Olivier Goffart
| | * | Avoid calls to public QScriptValue::engine() functionKent Hansen2009-10-233-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to engine() are mostly done for checking that the "source" and "target" engines are the same, but we don't want those checks to slow us down. Use an inline getEngine() function instead. This makes e.g. QScriptValue::call() ~10% faster for a function like "function(a, b) { return a + b; }". Reviewed-by: Olivier Goffart
| | * | Speed up QScriptValue creation by avoiding operator= to be calledKent Hansen2009-10-231-32/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-object values, just return the value immediately; there is no way that the later check (result.isObject()) will be true anyway. This makes qScriptValueFromValue() ~50% faster. Reviewed-by: Olivier Goffart
| | * | Bind QScriptValue to engine when the value is created internallyKent Hansen2009-10-231-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes creation+destruction of the QScriptValue a lot faster because it uses the engine's pool of QScriptValuePrivates instead of qMalloc()/qFree(). Reviewed-by: Olivier Goffart
| | * | Inline internal property lookup functionKent Hansen2009-10-233-28/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid looking up the object's own properties twice (before we called getOwnPropertySlot() and then getPropertySlot() on the same object). Makes QScriptValue::property() ~20% faster when calling it on an "empty" object. Reviewed-by: Olivier Goffart
| | * | Use an inline helper function to check if a QScriptString is validKent Hansen2009-10-233-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::property() ~10% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript object data() functionsKent Hansen2009-10-232-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::data() 15% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript object delegate functionsKent Hansen2009-10-234-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::scriptClass() 20% faster. Reviewed-by: Olivier Goffart
| | * | Inline scriptEngineFromExec() functionKent Hansen2009-10-232-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptContext::engine() 80% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript functions (frameForContext())Kent Hansen2009-10-232-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptContext::parentContext() 50% faster. Reviewed-by: Olivier Goffart
| | * | Inline two internal QtScript functions (contextForFrame() and globalExec())Kent Hansen2009-10-232-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptEngine::currentContext() 25% faster. Reviewed-by: Olivier Goffart
| | * | doc: Relationship of QGraphicsObject::parent && QObject::parentKai Koehne2009-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject::parent is actually about the QGraphicsItem hierarchy, not the QObject hierarchy. This is similar to QGraphicsWidget, where 'QObject::parent() should always return 0'. Maybe the explanation in QGraphicsWidget class documentation on this topic should be merged into QGraphicsObject, too? Reviewed-by: Andreas Aardal Hanssen
| | * | Fix bad check for GCC version.Thiago Macieira2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | These macros are available since GCC 2.95. Reviewed-by: Olivier Goffart
| | * | fix line endingOswald Buddenhagen2009-10-231-1/+1
| | | |
generated by cgit v0.12 at 2024-09-22 10:33:39 (GMT)