diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java @@ -109,7 +109,7 @@ FileObject projectDir = conf.getBaseFSPath().getFileObject(); if (projectDir != null && projectDir.isValid()) { try { - FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".mk"); //NOI18N + FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".nb"); //NOI18N Project project = ProjectManager.getDefault().findProject(projectDir); if (project != null && qtMakeFile != null && qtMakeFile.isValid()) { for (String str : qtMakeFile.asLines()) { diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java @@ -604,6 +604,7 @@ // It is important to generate makefile in current directory, and then move it to nbproject/. // Otherwise qmake will complain that sources are not found. bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N + bw.write("\t-cp -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".nb\n"); // NOI18N bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N // Removed paths tweak for Windows as when -spec is used everything works....