| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
These are cosmetic changes to files that do not end
with a newline character.
Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a
Reviewed-by: Rohan McGovern
|
|
|
|
|
|
| |
New files after previous license change round.
Reviewed-by: Trust Me
|
|
|
|
|
| |
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch uses icu to do string collation via QString::localeAwareCompare
function and for QString::toLower/toUpper - which is important e.g. for turkish
locales where uppercased 'i' is not a latin 'I'.
Based on the patch by Harald Fernengel
Reviewed-by: Harald Fernengel
Reviewed-by: Zeno Albisser
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-By: axis
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/declarative/positioners/layoutdirection/layoutdirection.qml
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Trying to build Qt with gcc 4.6 and the -flto optimization enabled
fails at ./configure state because the endianness can't be detected.
With -flto in QMAKE_CFLAGS and -fwhole-program in QMAKE_LFLAGS_APP,
gcc 4.6 manages to compute msb_bigendian[1] == lsb_littleendian[1] at
build time and reduces main() to "return 1;", throwing away the bits
being looked for.
Treating the short[] arrays as "code" and trying to actually run them
prevents even the -fwhole-program optimizer from kicking them out, and
since the endian test isn't actually run, doesn't break anything.
Merge-request: 1130
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
For QPA the unix tests are used to determine the availability of OpenGL
ES, so they need to compile even on Mac. Similarly the includes in the
OpenGL module have to be adapted on Mac.
Acked-by: Jørgen Lind
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|/ /
| |
| |
| | |
Reviewed-by: paul
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
add 0.0 at the end to be treated like trailing null (\0)
by some versions of 'strings' cli tool
Merge-request: 2550
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.
Task: QTBUG-14735
RevBy: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.
Task: QTBUG-14735
RevBy: Miikka Heikkinen
|
| |
| |
| |
| | |
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| |\ \
| | |/ |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Remove the auto config tests related to libicd-network-wlan-dev
* Add test for the icd backend
* Add test for connsettings
See also f532d8fcd236be9933e4186a95561e1c264de277.
Reviewed-by: Aaron McCarthy
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Jørgen
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-11671
RevBy: Trust me
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.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-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
GLU is not part of standard OpenGL and is not used internally in Qt,
so we should not depend on it.
Task-number: QT-12227
Reviewed-by: kim
|
|\ \ \
| | |/
| |/|
| | |
| | | |
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
|
| |
| |
| |
| |
| | |
The pro file was accidently missing of
42267701edd266463c90cec82d45022446a2606a
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add the configuration, autodetection, and the #define for vector
instructions on x86. The configuration has been extended with SSE3,
SSSE3, SSE4.1, SSE4.2 and AVX.
Reviewed-by: Andreas Kling
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-1853
Reviewed-by: Thiago
|
|\ \
| |/ |
|