Age | Commit message (Collapse) | Author | Files | Lines |
|
Make Wayland into a more proper platform target:
- fix configure to set PLATFORM
- move mkspec files to the right location
- fix up qmake.conf and qplatformdefs.h for path changes
- move stuff into wayland.conf from linux.conf
- fix io.pri to include linux files for wayland
And fix eglGetDRMDisplayMESA usage in light of recent Mesa commits.
|
|
If we need a special drawing engine, it should probably overload the
QGLPaintDevice code instead of keeping a window surface private, since
it will apply to pixmaps as well. So trim out that code (copied from
one of the other surface implementations) and simplify the Wayland
window surface.
|
|
We don't actually swap buffers under wayland; drawing is more directly
under client control. So use the window surface flush code to get
drawing from our private FBO into the window surface itself by binding
the renderbuffer colorbuffer before we actually draw the texture to the
output.
|
|
|
|
Could really make a specific "present buffer" call for Wayland, but
overloading swapBuffers works too. Attach the image at that time and
present it.
|
|
We only support EGL, so don't bother with VG. Fixup the image creation
and draw some test data into it for debugging, and add debug code for
successful image creation.
|
|
Track the surface for a given widget using the WId.
|
|
|
|
They don't really exist, so don't bother.
|
|
Get all the right symbols, don't get them again if we've already opened
the display.
|
|
- remove a bunch of unnecessary files
- create a wayland specific gl surface file (though not sure if we want it yet)
- add (broken) swap buffers code
Builds and ends up in the painting code now with the analogclock widget.
|
|
|
|
- check for right GL API
- initialize event dispatcher
- add error checking
|
|
|
|
Currently just uses the defaults, but we need a name.
|
|
|
|
Have to figure out how we want to do it...
|
|
Because C++
|
|
Stolen from Wayland client code.
|
|
|
|
And make sure we don't build X11 tools in tools/.
|
|
|
|
But will it blend?
|
|
|
|
Add a new platform target, called wayland, to support building a
Wayland-aware Qt library. Enabled by passing "-wayland" to configure.
Defines a new window system type, Q_WS_WAYLAND, which can be used to
pull in the right implementations or declare methods in various support
classes.
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed def file usage for Qt plugins under the makefile build system.
Fixed def file usage for the makefile build system on the SDK plugin.
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed def file usage for Qt plugins under the makefile build system.
Fixed def file usage for the makefile build system on the SDK plugin.
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed unescaped backslashes in testcase.prf
Skip tst_maketestselftest::make_check by default on Windows
Fixed tst_maketestselftest on QWS and Windows.
Add a test for the `make check' feature.
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
|
|
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647
Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80
|
|
|| <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Synchronizing to latest tree
Adding correct hungarian translation
Search local directory if no qconfig file found in src/corelib/global/
Fix QT_NO_CLIPBOARD
Fix QT_NO_ACTION
|
|
|
|
Previously it would not use the autogenerated def files.
RevBy: Thomas Zander
|
|
RevBy: Thomas Zander
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add a note to the Linguist docs stating XLIFF 1.0 is not supported
remove spurious empty lines in the linguist tools' output
don't use qWarning() - or even qFatal()! - gratuitously.
Styled item view backgrounds in Gtk+
Ensure that we only have one QLayoutStruct struct by renaming the other
|
|
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
translations/assistant_hu.ts: Translated: 231 of 231 (100%)
translations/designer_hu.ts: Translated: 85 of 1248 (6%)
translations/linguist_hu.ts: Translated: 393 of 393 (100%)
translations/qtconfig_hu.ts: Translated: 73 of 168 (43%)
translations/qt_help_hu.ts: Translated: 80 of 81 (98%)
translations/qt_hu.ts: Translated: 2402 of 2464 (97%)
translations/qvfb_hu.ts: Translated: 65 of 65 (100%)
Merge-request: 659
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
The earliest version we support is XLIFF 1.1, so now this is made
clearer.
Task-number: QTBUG-9193
Reviewed-by: Morten Engvoldsen
|
|
Integrated changes:
|| <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page ||
|| <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 ||
|| <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar ||
|| <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter ||
|| <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge ||
|| <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
|
|
configure script searched qconfig-local.h under src/corelib/global/
with "-qconfig local". After this commit, configure tries to find local
directory if the file is not found in the path.
Now you can pass the option like "-qconfig ./qconfig-myconfig.h"
Merge-request: 2341
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
Merge-request: 658
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
|
|
Merge-request: 657
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Skip tst_maketestselftest::make_check by default on Windows
Fixed tst_maketestselftest on QWS and Windows.
Add a test for the `make check' feature.
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qgraphicsitem: stabilize on X11
Added OpenGL 3.3 and 4.0 recognition to QGLFormat
Fix compilation: disable -no-feature-* for bootstrapped
QString: Fix severals bugs when comparing with QStringRef
QProgressBar: make accessors const.
Changes: add patch for artificial emboldening
Added static version of QGLFramebufferObject::release().
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
|
|
nmake and checktest are too slow on Windows for this test to
be enabled by default. Set RUN_SLOW_TESTS=1 to run the test
manually.
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
remove spurious empty lines in the linguist tools' output
don't use qWarning() - or even qFatal()! - gratuitously.
Styled item view backgrounds in Gtk+
Ensure that we only have one QLayoutStruct struct by renaming the other
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Using Symbian's future font table getter Api
Standalone Qml demos for Fluidlauncher
Fixed S60_VERSION variable exists checks
|
|
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed tst_maketestselftest on QWS and Windows.
Add a test for the `make check' feature.
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
|
|
ConversionData::error() does already newline-terminate the strings.
|