| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
|
| |
| |
| |
| |
| |
| |
| | |
I don't know why, even though it's specified in POSIX. But we have to
cope with broken stuff.
Reviewed-by: Bradley T. Hughes
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
I have been bitten by this quite often and I had never found out why
suddenly configure decided to erase all my build. It happens that my
"make" replacement script command tries to search for a Makefile in
the parent dirs (so I can run "make" while inside src/corelib/tools),
and this caused the whole build to be erased.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags
on the link line if it is needed by the OpenVG engine.
Reviewed-by: trustme
|
| |
| |
| |
| |
| | |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
| |
| |
| |
| |
| |
| |
| |
| | |
This makes sure that we only detect and use libraries that are actually
in the SDK.
Task-number: 109757
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| | |
If unixodbc detection fails, try and link/detect iodbc libraries and link against them.
Reviewed-by: Lincoln Ramsay
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
architechtures.
For example,
./configure -arch x86_64 -arch ppc requires D-Bus compiled for x86_64 and ppc
in order to enable it.
Task-number: 249881
Reviewed-by: nrc
|
|/
|
|
|
|
|
| |
Quote a few variables that may contain spaces. Also, quote spaces
in qmake's Makefile dependency section.
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The OpenGL ES config tests are there to test if there's enough to build
QtOpenGL, not OpenGL applications using Qt. Therefore we should use
QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely
because Qt needs to link against EGL whereas Qt applications do not.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
Previously, it was entirely possible to successfully configure Qt/X11
without any X11 installed. The problems would only start showing up once
you stated building. This is not very useful if you're cross-compiling
and trying to setup the paths correctly.
Reviewed-by: Denis
|
|
|