diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-12 21:46:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 12:45:02 +0200 |
| commit | e5b203dbc7da249e89cc800a7b6a41af8b913ecc (patch) | |
| tree | 6232e80c69c0bc10fd9ac54c6c791604b4ea6372 /qmake/generators/win32/msvc_vcproj.h | |
| parent | c1056c80fbeadee4b910df00998c837d3c2b44a1 (diff) | |
dispose of MSVCPROJ_LIBS
this way QMAKE_LIBS{,_PRIVATE} can be treated the same as in all other
generators, which allows us to:
- make the windows generators' findLibraries() be more like the unix
version
- dispose of QMAKE_INTERNAL_PRL_LIBS handling while reading prl files
(because the output always goes to QMAKE_LIBS)
- as a side effect, QMAKE_LIBS_PRIVATE are not subjected to prl file
resolution any more, which is again consistent with unix - the
correctness of that needs to be assessed separately.
Change-Id: Ie9bc04d117eff6a7cde846677f98acf3c64aa6ee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 416e233614..fe5bfa4b71 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -92,7 +92,6 @@ protected: virtual bool mergeBuildProject(MakefileGenerator *other); virtual bool openOutput(QFile &file, const QString &build) const; - virtual bool findLibraries(); virtual void outputVariables(); QString fixFilename(QString ofile) const; @@ -141,11 +140,6 @@ inline QString VcprojGenerator::defaultMakefile() const return project->first("TARGET") + project->first("VCPROJ_EXTENSION"); } -inline bool VcprojGenerator::findLibraries() -{ - return Win32MakefileGenerator::findLibraries("MSVCPROJ_LIBS"); -} - QT_END_NAMESPACE #endif // MSVC_VCPROJ_H |