Attachment #141659 for bug #237355

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 237355
Collapse All | Expand All

Lines 109-115 Link Here

(-)a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java (-1 / +1 lines)
109	FileObject projectDir = conf.getBaseFSPath().getFileObject();	109	FileObject projectDir = conf.getBaseFSPath().getFileObject();
110	if (projectDir != null && projectDir.isValid()) {	110	if (projectDir != null && projectDir.isValid()) {
111	try {	111	try {
112	FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".mk"); //NOI18N	112	FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".nb"); //NOI18N
113	Project project = ProjectManager.getDefault().findProject(projectDir);	113	Project project = ProjectManager.getDefault().findProject(projectDir);
114	if (project != null && qtMakeFile != null && qtMakeFile.isValid()) {	114	if (project != null && qtMakeFile != null && qtMakeFile.isValid()) {
115	for (String str : qtMakeFile.asLines()) {	115	for (String str : qtMakeFile.asLines()) {

Lines 604-609 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java (+1 lines)
604	// It is important to generate makefile in current directory, and then move it to nbproject/.	604	// It is important to generate makefile in current directory, and then move it to nbproject/.
605	// Otherwise qmake will complain that sources are not found.	605	// Otherwise qmake will complain that sources are not found.
606	bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N	606	bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N
		607	bw.write("\t-cp -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".nb\n"); // NOI18N
607	bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N	608	bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N
608		609
609	// Removed paths tweak for Windows as when -spec is used everything works....	610	// Removed paths tweak for Windows as when -spec is used everything works....

Return to bug 237355