Changeset 897 for trunk/qmake/generators/makefile.cpp

Timestamp:

Jul 19, 2011, 1:21:43 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Proper fix to create install rules in Makefiles at first run.

The previous fix from Nokia (3d6f1ebf) did not actually work since it
would not take many things into account, e.g. the target extension,
shadow builds and so on.

File:

• trunk/qmake/generators/makefile.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -1294 +1294 @@
                 if(!dirstr.endsWith(Option::dir_sep))
                     dirstr += Option::dir_sep;
-                bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
+                bool is_target = QFileInfo(wild) ==
+                    QFileInfo(Option::fixPathToTargetOS(QDir(Option::output_dir)
+                                                        .absoluteFilePath(var("DEST_TARGET"))));
                 if(is_target || exists(wild)) { //real file or target
                     QString file = wild;