| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-By: axis
|
| |\
| |
| |
| |
| | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| | | | |
| | | |
| | | |
| | | | |
RevBy: Liang Qi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It fails the build anyway.
RevBy: Liang Qi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: axis
RevBy: Morten Johan Sørvig
Conflicts:
configure
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was done for a number of reasons:
- In order to get better consistency with the other mkspecs, which
have the target system name followed by a hyphen and the compiler
name.
- There is no real reason why we should have specific mkspecs for
compiling Symbian under Linux, when it is equally likely to work
under other operating systems.
RevBy: Thomas Zander
Conflicts:
src/s60main/s60main.pro
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
was given.
Since the script only checked the value of canBuildWebKit when
CFG_WEBKIT was set to "auto", a static WebKit build was still possible,
this again resulted in build (linking) errors later in the build process.
Note: The changes in this patch means that -static will take precedence
over -webkit.
Reviewed-by: Simon Hausmann
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits)
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
QAbstractSocket: Check for socket state on Unbuffered reads
Corrected a mismerge in GCCE link parameters.
QAbstractSocket: Check for engine validity on Unbuffered reads
tst_qnetworkreply: fix the MiniHttpServer.
tst_qnetworkProxyFactory: fix debug output.
Fixed incorrect referral to an include file.
tst_qnetworkreply: getErrors() only ignore warning for the specific test
Check engine existence before increasing reference count
Fixed library casing.
Fix Q_INVOKABLE declared after Q_PROPERTY
tst_qnetworkreply: small improvements
QNAM: Add a warning for misuse of the file backend.
Keep reference count for cached font engines in QTextEngine
QNAM HTTP: Be more strict with HTTP channel state
tst_qnetworkreply: Add a test for broken gzip encoding
QNAM HTTP: Add qWarning() for double-finished() bug
fix documentation typos in isLowSurrogate and requiresSurrogates
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Liang Qi
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It fails the build anyway.
RevBy: Liang Qi
|
| | | | | |
| | | | |
| | | | |
| | | | | |
when we don't have it
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Rename to qconfig.nacl.h. This reflects that the
config now enables all dependencies NaCl can
support, not necessarily the minimal set.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | | |
(libtiff doesn't compile)
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: paul
|
| |\ \ \ \ \
| |/ / / / |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the INTEGRITY drivers are in the source tree, show them as available
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change e0c2861976e06658a1d651941310407c15b0bcde fixed es1 configure by
only picking EGL/egl.h if GLES/egl.h is not found. This broke es2
configure on platforms where both EGL/egl.h and GLES/egl.h are present,
by picking GLES/egl.h instead of EGL/egl.h, which implicitly pulled in
the GLES/gl.h header as well, causing inconsistent declarations due to
both GLES2/gl2.h and GLES/gl.h getting included. Instead, we need to
prioritize depending on whether we're using es1 or es2. For es1, we
prefer GLES/egl.h, and for es2, we prefer EGL/egl.h. If only one of the
headers is found we still use it unconditionally, to preserve the
existing behaviour and minimize the risk of breaking other platforms.
Reviewed-by: Ritt Konstantin
Reviewed-by: Marius Storm-Olsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This adds what is already there for different plugin types to
imageformats plugins -- allowing the user to configure which
image formats will be built into Qt and which will be built as
plugins.
Merge-request: 1028
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits)
Lighthouse: License headers to new files in testlite
Make sure we blit the fbo on flush in QGLWindowSurface
Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice
Making clearer separation between responsibility of different classes
Make it possible to vertically mirror gl painting
Lighthouse:Wayland Moving some logic into files
Fix Wayland plugin to work with Wayland after some interfaces changed
Make QGLContext::fromPlatformGLContext show correct sharing
Remove Lighthouse specific code from QGLWindowSurface
Fix X11 clipboard bug.
Fix for uninitialized member in QWaylandCursor
wayland: use pkgconfig for libdrm in wayland.pro
wayland: remove non-public header from config.tests
wayland: fix SOURCES to point to wayland.cpp in config.tests
Wayland: request rbg and premultiplied argb visuals as needed
Wayland: clamp window resizes to screen size
Wayland: split GL code into separate files
Wayland: use correct viewport for swapBuffers and correct coords
Wayland: fix geometry of swapBuffers
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Broken due to conflict resolution in 5422e929cad04633a06c156cba96cfcd69262522
Since we now support compiling QPA (lighthouse) on Mac, the platform
logic in configure becomes a bit more complicated.
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
!"no" != "yes"; use the same condition in both places
Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
try <GLES/egl.h> first, and if that fails, try <EGL/egl.h>. if
CFG_EGL_GLES_INCLUDES is "no", then QT_GLES_EGL is not defined and
type re-definitions in GLES/egltypes.h and EGL/egl.h might occur later.
Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-16176
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
it's pointless to check which files are present, as we only have
all-platform packages now.
Task-number: QTBUG-15685
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15626
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15228
Reviewed-by: mariusSO
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In user applications it should be possible to write something like
qpa {
HEADERS += Lighthousespecificheader.h
}
Reviewed-by: paul
|
| |\ \ \
| |/ / |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | | |
|
| |/ /
| |
| |
| | |
(configure has trouble separating host and target platforms.)
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | |
| |
| |
| |
| |
| | |
Marketing needs this for commercial customers.
Reviewed-by: Trust Me
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|
| | | |
|
| | |
| |
| |
| |
| | |
checking the stdout of a grep redirected to /dev/null is rather
pointless. also, this code had a syntax error ...
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |
| |
| |
| |
| |
| | |
Always enable Phonon on Symbian unless it was explicitly disabled.
Reviewed-by: ossi
|
