| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
This avoids the enormous duplication of identical command line
arguments passed down to compile.test.
This necessitates the addition of a -config parameter to compile.test,
as QMAKE_CONFIG needs to be extended in some cases.
Backport of qtbase commit ca4823505bee3674a8d65cd1bdd45ea93546114b.
Change-Id: I22aa0336443d330e49e674e5484f08c43c913d31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise CROSS_COMPILE is not available for config.tests
because qdevice.pri is not found in such configurations as:
./configure -xplatform win32-g++-4.6 \
-device-option CROSS_COMPILE=$TARGET \
-prefix=$PREFIX/$TARGET \
-prefix-install
Normally, we don't want to use .qmake.cache during tests,
but we need that mechanism here.
Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
| |
Reviewed-By: axis
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This changeset provides the basis for targetting win32-g++ on Unix using
the configure shell script:
support added to the configure script itself
support added to relevant config.tests
support added to mingw makefile generator in qmake
new makespec: unsupported/win32-g++-cross
The makespec is based on the win32-g++ makespec.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Instead of hard coding "make", use "$MAKE". If $MAKE is not set,
configure will export it for us when searching for "make".
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
|\
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
| |
This makes sure that we only detect and use libraries that are actually
in the SDK.
Task-number: 109757
Reviewed-by: Richard Moe Gustavsen
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|