63a812b851
In a cross built Qt, for example Qt for Android, calling "qmake -spec
android-clang" led to an error message:
"Could not find qmake spec '-qtconf'."
This happened, because:
- the qmake in Qt for Android is a wrapper script that calls
"qmake -qtconf qt_target.conf -spec android-clang"
- the first stage of command line argument handling in qmake garbled the
call to "qmake -spec -qtconf qt_target.conf android-clang"
We do not modify the order of arguments anymore.
Instead, we skip the "-qtconf <file>" arguments in the first argument
handling stage that is supposed to determine qmake's modus
operandi (like -project or -query).
In addition, we need to fix the assignment of
QLibraryInfoPrivate::qtconfManualPath which was only done if
QMakeGlobals::addCommandLineArguments returned ArgumentsOk. However,
this function returns ArgumentUnknown, if it encounters an argument it
cannot handle - like the project name.
Now, we assign QLibraryInfoPrivate::qtconfManualPath if there was no
error detected.
Document the return values of addCommandLineArguments.
This amends commit
|
||
|---|---|---|
| .. | ||
| ioutils.cpp | ||
| ioutils.h | ||
| proitems.cpp | ||
| proitems.h | ||
| qmake_global.h | ||
| qmakebuiltins.cpp | ||
| qmakeevaluator_p.h | ||
| qmakeevaluator.cpp | ||
| qmakeevaluator.h | ||
| qmakeglobals.cpp | ||
| qmakeglobals.h | ||
| qmakeparser.cpp | ||
| qmakeparser.h | ||
| qmakevfs.cpp | ||
| qmakevfs.h | ||
| registry_p.h | ||
| registry.cpp | ||