diff options
| author | Iain <qt-info@nokia.com> | 2010-05-14 15:06:27 +0200 |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-05-14 15:16:51 +0200 |
| commit | f4ffb4b082a43ba267855fbe915da9f934f59043 (patch) | |
| tree | 48ded0ebb5c89f146316351a1b47ac04926b0fca /qmake | |
| parent | 217cd535974720ea082f900d9adeb06cca2c530d (diff) | |
Shadow building on Symbian fixes: part 3 - unchanged source tree
Stop symbiancommon.obj being generated in the source directory even when
shadow building
(make has a rule to make .obj files, and quite happily makes the .obj in
the source dir when it sees it as a dependency....)
Also, correct spaces instead of tabs - this is a makefile!
Task-number: QTBUG-10432
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 956fa9c5db..b58757cb3e 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -200,7 +200,7 @@ clean:: -del symmake.obj -del symmake_abld.obj -del symmake_sbsv2.obj - -del symbiancommon.obj + -del symbiancommon.obj -del initprojectdeploy_symbian.obj -del registry.obj -del epocroot.obj @@ -442,7 +442,7 @@ pbuilder_pbx.obj: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp makefiledeps.obj: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp -metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.obj +metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(CXX) $(CXXFLAGS) generators/metamakefile.cpp xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp |