Revert "move .qmake.cache search to Option"
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 9 May 2012 13:14:37 +0000 (15:14 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 14:37:49 +0000 (16:37 +0200)
commit4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3
treec227d4dc3915399662764abef984815f60f1ddf6
parentd8b2998daeab9bfb7bfb5182960ec09b94885b17
Revert "move .qmake.cache search to Option"

We are now moving in the exact opposite direction.
This logically reverts commit 059200a44ba7177d0c9ec6bb5e6ee0b7e0c3f017.
Some adjustments were necessary to maintain the project root stuff.

Conflicts:

qmake/main.cpp
qmake/option.cpp
qmake/option.h
qmake/project.cpp

Change-Id: Ic14fa571cbbfe9ac159f92493e49741d70a87eff
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
qmake/main.cpp
qmake/option.cpp
qmake/option.h
qmake/project.cpp