| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| | |
if the platformWindow is visible. Also had to make sure that the
QGLContext of a QGLWidget was recreated.
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
configure
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some of the library dependencies of the ICD Bearer Management plugin use
Qt. We include them in src/3rdparty and link against them statically to
avoid the circular build dependency. Libraries that do not use Qt are
still linked dynamically. The libraries which are statically linked are
libconninet and libgq-gconf.
Task-number: QTBUG-12354
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QPlatformGlContext has now a pure virtual format getter.
The way its intended to work is that the tlw has a QPlatformWindowFormat
which is the requested format. Once you get the QPlatformGlContext of
the window, you can request the QPlatformWindowFormat of the context to
see what you really got.
|
| | | |
| | | |
| | | |
| | | | |
And make it also work without a gui manager
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
seperated the functionality into different files, and made the
paintdevice belong to the windowsurface. Everything really belongs to
the screen, since everything is full screen but, this makes it more on
par with the other plugins.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This adds a getter to QPlatformGLContext for the "default shared
context". The setter is protected as it is the plugins responsibillity
to create it or not. QPlatformWindowFormat has also gotten a pointer to
a QPlatformGLContext for a non default shared context. Only implemented
shared contexts in testlite for now.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
and moved it onto QBlittablePixmap making the class abstract. The
creator function was seen as to spesialised to be part of the
PlatformIntegration class, and belonged to the QBlittablePixmap class
anyway since that was the PixmapData type you would need to return to
use the blitter api. Also removed the cross platform examples as they
are more confusing than anything else. For usage of QBlittable look in
the directfb platform integration plugin.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | | |
| | | | |
| | | | |
| | | | | |
e51af0d74f8bb6ca6100d2338671d2d053bfed01
|
| | | | |
| | | | |
| | | | |
| | | | | |
7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
|
| | | | |
| | | | |
| | | | |
| | | | | |
f84bb604d745c512db8d53410c5fec835309f85e
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The root cause is failing compilation test for SNAP when it shouldn't,
but it should still not result in compilation errors in code.
|
| | | | | |
|
| | | |/
| | |/|
| | | |
| | | | |
2f582953ecfc53f217317f58e4fc75b5b51a1126
|
| | | |
| | | |
| | | |
| | | | |
f17d8a5dbef076046ff504fecb1fd445c9b785ac
|
| | | |
| | | |
| | | |
| | | | |
426ff79e49d4abb659167541bb67846443b9707e
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is useful to know the priority order of the sub configurations of
a service network.
Task-number: QTBUG-11678
RevBy: juhvu <qt-info@nokia.com>
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added silent behavior to the most important Symbian build steps.
Fixed compiling with symbian/linux-armcc and configure -silent option
Removed some warnings from armcc that are unneeded.
Made the makefile build system use QMAKE_CFLAGS.xxx properly.
Automatically disabled unsupported modules for certain compilers.
Fixed an incorrect profile inclusion.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task: QTBUG-11927
RevBy: Trust me
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Compile fix for MSVC"
Compile fix for MSVC
Improve QAccessible for QAccessibleTabBar
Improve QAccessible for QTabBar
fix the export macros for the QtDBus module
rebuild configure.exe
make "configure -qt-gif" work again on Windows
Fix a typo in harfbuzz thai line breaking.
Ensure that font sizes that are > 0 and < 1 are still respected
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On QAccessibleTabBar::text return text of the current tab for the case the QTabBar itself is asked for it's Name.
Merge-request: 2405
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use aligned load for the blending of RGB32 over RGB32
tst_moc: workaround gcc bug.
Some more change to the changelog
Fix compilation with QT_NO_GRAPHICSVIEW
Updates changes-4.7.0
Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.
Add a missing file in the config.test for SSE 4.2
Remove the masking when computing qAlpha()
Add support for more vector instructions on x86
Workaround gcc bug, disable test with old version of gcc
Do not crash due to a infinite recursion when using voiceover on MacOS
doc: Fix qdoc errors for text related files
QGraphicsItem: Animation leaves drawing artifacts when clipping is used.
moc: Slot with complex template default value does not compile
|
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reason for the infinite recursion was that
QAccessibleTitleBar::object() returned the titlebar's dockwidget.
This could lead to a problem when the AT client tried to
traverse the accessibility hierarchy:
As a response to QAXChildrenAttribute (retrieve children) on a dock
widget node, it would register it's children in the
hierarchy manager. In this case, the object registered for the titlebar
interface was the QDockWidget.
In order to do further traversal, the bridge could call
queryAccessibleInterface on the list of retrieved children to get the
QAccessibleInterface for those objects, however, that would return the
QAccessibleDockWidget interface that we just had traversed,....
Task-number: QTBUG-6843
Reviewed-by: Carlos Manuel Duclos Vergara
|
| | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
src/sql/drivers/drivers.pri
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since we cannot extract to the epocroot (it is considered R/O), we
extract the header and the dso to the temporary build directories and
include them from there.
RevBy: Trust me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes: NB#176643 - Segmentation fault occurs while using networking
Reviewed-by: Adrian Constantin
|
| | |\ \ \ |
|
| | | |\ \ \
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously sql driver recipes each appeared in both the plugin
pro file and src/sql/drivers/drivers.pri for building into QtSql.
Split driver recipes into shared pri files.
Also split bundled 3rd party sqlite code recipe into a shared pri.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\ \ \ \ |
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
still needs work, debugging, additional threading support, and probably
refactoring.
This includes a connman dbus service wrapper that has more functionality
than is needed by the bearer backend but still missing some
'set' functionality for a complete connman wrapper.
Developed with wifi/desktop on 'lucid' kubuntu, using the connman available at
http://ppa.launchpad.net/indicator-network-developers/ppa/ubuntu
|
|\ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|