summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-2048-111/+631
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/glxconvenience/qglxconvenience.cpp src/plugins/platforms/platforms.pro src/plugins/platforms/wayland/qwaylandwindow.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/plugins/platforms/xcb/qxcbwindow.h src/plugins/platforms/xcb/qxcbwindowsurface.cpp src/widgets/kernel/qwidget_qpa.cpp tests/auto/qvariant/tst_qvariant.cpp
| * Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ↵Simon Hausmann2011-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASCII range Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a) and unicode overline (0x203e). ICU and (as it turns out) Symbian's native Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode. Qt's behaviour creates a problem when loading japanese web sites that are encoded in Shift-JIS. When they reference external JavaScript files, those tend to inherit the current page encoding (unless the character set is explicitly specified). Consequently JavaScript tends to contain regular expressions (as a built-in feature of the language), which in turn uses backslashes for escape sequences. Therefore it is crucial that the encodings used to decode the script preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to something else. This patch corrects the behaviour of Qt's Shift-JIS codec to leave all characters < 0x80 unaltered in the process of conversion to and from Unicode. Task: QTBUG-19335 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 8e321cd869da7ff1cf0168da41aa0246b44867cc)
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-202-4/+29
| |\ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tst_qhostinfo: Fix IPv6 lookup detection on Windows. Fix incorrect hardware address on systems without getifaddrs() Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
| | * Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On unix systems for which QT_NO_GETIFADDRS is defined, the way that the hardware address field is extracted from the result of a call to qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct is taken rather than the appropriate member within that struct, sa_data, resulting in a memory offset and subsequently the hardware address has garbage in the first two of six fields. This commit modifies the code to pass the sa_data member instead of the address of the struct as a whole. Task-number: QTBUG-19165 Merge-request: 2614 Reviewed-by: Martin Petersson (cherry picked from commit 004ad12669ef696eeba70fd57d1eb0c67c806d1d)
| | * Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-201-3/+28
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-18426 Reviewed-by: Peter Hartmann (cherry picked from commit ebc134db484eee31491836b619aad1ee86e3070e)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-2018-55/+149
| |\| | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Full translucent background support in xcb and xlib backend. Lighthouse xcb and xlib: Add support for transparency of GLX windows. Lighthouse minimal: Add support for transparency Compile fixes for Xlib plugin.
| | * Full translucent background support in xcb and xlib backend.Samuel Rødal2011-05-197-12/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to pick an alpha visual also for non-GL surface types, and to ask for alpha in the window format if the WA_TranslucentBackground attribute is set. Reviewed-by: Janusz Lewandowski (cherry picked from commit 6241e39cff9311c943430ff2f31236b13618f2ac)
| | * Lighthouse xcb and xlib: Add support for transparency of GLX windows.Janusz Lewandowski2011-05-1910-25/+78
| | | | | | | | | | | | | | | | | | Merge-request: 1231 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit a3b627e1c5ce03a2500ab35c64729b1995639dcc)
| | * Lighthouse minimal: Add support for transparencyJanusz Lewandowski2011-05-192-3/+3
| | | | | | | | | | | | | | | | | | Merge-request: 1231 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit c15b41056e60abdbb4d835e27a360f01be618a4f)
| | * Compile fixes for Xlib plugin.Samuel Rødal2011-05-194-15/+13
| | | | | | | | | | | | (cherry picked from commit 4af11f2c6666c55657569f946c33816f33711225)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-201-1/+2
| |\| | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Don't crash if windowmanager is not initialized Compile fix for 64bit Linux.
| | * Don't crash if windowmanager is not initializedLasse Holmstedt2011-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | This can happen if there is e.g. no wayland server. Reviewed-by: sroedal (cherry picked from commit aea5e35f57d061b133d2fa613d10f5e0118f5706)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-199-1/+324
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Wayland: send surface id + process id pairs to compositor
| | * Wayland: send surface id + process id pairs to compositorLasse Holmstedt2011-05-199-1/+324
| | | | | | | | | | | | | | | | | | | | | | | | This enables doing window/process management since we can now actually map the process we've launched to a window. Reviewed-by: Samuel Rødal (cherry picked from commit 457c33d9fd308542c9290fd60bf86960f9251255)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-2/+1
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove warning from QColor::setNamedColor().
| | * Remove warning from QColor::setNamedColor().Samuel Rødal2011-05-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning is pointless as the user can anyway check if the color is valid after making the call by calling isValid(). Using isValidColor() could be used but it has a big performance overhead as validation then needs to be done twice. Task-number: QTBUG-19098 Reviewed-by: Erik Verbruggen (cherry picked from commit a423ff5474b89028eeca95b254f5184311c8223b)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-1/+1
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fixed compile of qdrawhelper_neon.cpp.
| | * Fixed compile of qdrawhelper_neon.cpp.Samuel Rødal2011-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need to use the quad-word intrinsic and reinterpret the cast to a signed int vector. Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com> (cherry picked from commit d2d7aef223a3bad368c6b7c7f7f4617f4acf323c)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Compile IPC tests. Always call XInitThreads. Remove redundant #ifdef's from benchmarks Improve coding style of qdatastream test Don't use Qt3Support in arthur test suite. Remove Qt3Support code from QMenuBar autotest Remove Qt3Support code from QSplitter autotest Remove Qt3Support code from QSharedPointer autotest Remove Qt3Support code from QComboBox autotest Remove Qt3Support test code from accessibility autotest tests: allow unstable tests to be marked with CONFIG+=insignificant_test
| | * Always call XInitThreads.Gunnar Sletta2011-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Any Qt application that embeds a QSGView needs to call this because of the threaded renderer. Today applications that use threaded GL silently fail. In a few weeks time, the refactor branch will be merged, which will obsolete this change, so it is a temporary measure to get tests and examples running.
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-199-19/+91
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tests: fixed compilation of tst_qtextstream QUiLoader, QAbstractFormBuilder: Introduce errorString(). Enable configuration for Xcb Fall back to using paths for large fonts in drawStaticText() Add ability to work around non-standard GLES implementations Fix broken drawing with large fonts using QStaticText and FreeType Remove Q_ASSERT's from qdbustype autotest Remove autotest code for Qt3Support library.
| | * QUiLoader, QAbstractFormBuilder: Introduce errorString().Friedemann Kleint2011-05-182-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce errorString() to be able to obtain load errors in Qt Designer. Remove automatic Qt 3 form conversion from Qt Designer (since uic3 no longer exists) and move all form load error checking logic including language check into QAbstractFormBuilder. Make language accessible in FormBuilderExtra in case Jambi is revived. Reviewed-by: hjk
| | * Enable configuration for XcbEckhart Koppen2011-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The xcb platform plugin can now be enabled using -xcb at configuration time. A configuration time compilation check will be added at a later point. Reviewed-by: Samuel Rødal
| | * Fall back to using paths for large fonts in drawStaticText()Eskil Abrahamsen Blomfeldt2011-05-184-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStaticText had an implicit risk which meant you had to make sure the text size did not grow unreasonably large. This was intended to avoid hiding the performance impact of using QStaticText for such a purpose, but it's too inconvenient. Thus, the same fall back as in drawTextItem() has been introduced. This will also fix a bug recently introduced when we started using the FT cache to draw static text in the raster engine, since this will fail for large fonts. Task-number: QTBUG-19084, QTBUG-19370 Reviewed-by: Jiang Jiang (cherry picked from commit 0aa9b30432cec3b7f366983f451fc9a7f8f83243)
| | * Add ability to work around non-standard GLES implementationsPaul Olav Tvete2011-05-181-3/+3
| | | | | | | | | | | | Reviewed-by: Gunnar
| | * Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FreeType, there's a fall back to QFontEngine::alphaMapForGlyph() when the fonts are very large. Since this uses a QPainterPath containing an unhinted glyph, the use of hinted metrics would sometimes lead to the glyphs being clipped because they would be positioned slightly outside the image they were painted into. When outline drawing is on, it makes sense to return unhinted metrics, since the glyphs we will actually use are unhinted. Task-number: QTBUG-19067 Reviewed-by: Jiang Jiang
| * | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-185-21/+16
| |/ | | | | | | | | | | | | | | | | | | | | | | In 4.8 we added support for using StringBuilder with QByteArray. But this is breaking source compatibility for people that used QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro Notice that QT_USE_FAST_CONCATENATION was not working without QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro. Reviewed-by: joao (cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)
* | Get the QWidget auto-test compiling and running.Samuel Rødal2011-05-204-6/+6
| |
* | Added QGuiApplication::activeWindow().Samuel Rødal2011-05-204-2/+14
| |
* | remove an unused classLars Knoll2011-05-204-31/+0
| | | | | | | | | | QDrgResponseEvent wasn't used anywhere in Qt anymore. Get rid of it.
* | move drag handling back to GuiLars Knoll2011-05-209-59/+58
| | | | | | | | | | | | | | | | | | | | Move the DnD related classes back into QtGui. Parts of the implementation is currently commented out and needs to be moved to QWidgetWindow. SC incompatible change: APIs taking QWidget * now take QObject *
* | Build the cocoa plugin on Mac.Morten Sorvig2011-05-201-0/+4
| |
* | Add QCocoaNativeInterface.Morten Sorvig2011-05-207-4/+135
| | | | | | Supports getting the NSOpenGLContext for now.
* | Better setWindowFlags() support in XCB window.Samuel Rødal2011-05-196-49/+100
| | | | | | | | | | We need to re-create the native window in setParent, as used to be done in QWidgetPrivate::setParent_sys in qwidget_x11.cpp.
* | Remove QMAKE_MACOS_DEPLOYMENT_TARGET.Morten Sorvig2011-05-191-1/+0
| | | | | | | | | | | | | | Not needed any more, 10.5 and up supports setting the deployment target/minimum version on the compiler command line.
* | Support Qt::WindowStaysOnTopHint and other window flags in XCB backend.Samuel Rødal2011-05-182-4/+111
| |
* | Port Qt 5 to Mac.Morten Sorvig2011-05-1817-80/+313
| |
* | Add QWindow::setWindowModality().Samuel Rødal2011-05-187-19/+151
| | | | | | | | Also set corresponding window manager hints in xcb plugin.
* | Re-implement transient window support in XCB backend.Samuel Rødal2011-05-166-36/+50
| | | | | | | | | | | | If a QWindow has a parent but is top-level the corresponding QPlatformWindow should not be re-parented but instead be made transient for the parent window if possible.
* | Implement QWindow minimum/maximum/base size hints and size increments.Samuel Rødal2011-05-168-31/+182
| |
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-1634-261/+336
|\| | | | | | | | | | | Conflicts: src/modules/qt_openvg.pri src/widgets/to_be_moved/qlinecontrol_p.h
| * Removed duplicate setting of QT dependenciesEckhart Koppen2011-05-131-2/+0
| | | | | | | | Reviewed-by: TrustMe
| * Updated default Qt version to 5.0.0Eckhart Koppen2011-05-132-2/+2
| | | | | | | | | | Changed default version in qbase.pri and qpluginbase.pri in case no version is given at all.
| * Removed deprecated functions in QListEckhart Koppen2011-05-131-91/+0
| | | | | | | | | | Removed detach, detach2, detach3 and append which were marked as required only up to 4.5.x
| * Updated Qt and QtBase module version number to 5.0.0Eckhart Koppen2011-05-1312-35/+35
| | | | | | | | Updated version in qglobal.h as well as the module version itself
| * Updated data stream version for Qt 4.9 and 5.0Eckhart Koppen2011-05-131-3/+4
| | | | | | | | | | For now, using the same version as 4.8. This needs to be corrected when the actual data stream version is known.
| * Fix deadlocks in wayland clipboard that can occur in special scenarios.Laszlo Agocs2011-05-132-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | setMimeData() emits the changed signal always so to prevent duplicated signals keyboardFocus() must only emit when the change came from another wayland client. However direct connection may cause issues when invoking the slot from a wayland callback, so use a metacall to make sure we return from the callback. Unnecessary data transfer and potential deadlock is now also avoided when a client is requesting the mime data from itself. Reviewed-by: Jørgen Lind
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingJason McDonald2011-05-1318-1559/+1390
| |\
| | * fix compilation with namespacesLars Knoll2011-05-121-8/+8
| | | | | | | | | | | | | | | Reviewed-by: Bjørn Erik Nilsen (cherry picked from commit 7a1c29f101b95c9cc2cb53f8b80d231b5a994a9a)
| | * Fix compilation with namespaces enabledLars Knoll2011-05-122-0/+14
| | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal (cherry picked from commit bff68fc7094a50af57f7da23ecf9b25cab00f188)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 00:29:10 +0000