forked from qt-creator/qt-creator
		
	Compile
This commit is contained in:
		@@ -504,6 +504,12 @@ void Qt4Project::updateCodeModel()
 | 
			
		||||
        predefinedIncludePaths.append(info.absoluteFilePath());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    FindQt4ProFiles findQt4ProFiles;
 | 
			
		||||
    QList<Qt4ProFileNode *> proFiles = findQt4ProFiles(rootProjectNode());
 | 
			
		||||
    QByteArray definedMacros = predefinedMacros;
 | 
			
		||||
    QStringList allIncludePaths = predefinedIncludePaths;
 | 
			
		||||
    QStringList allFrameworkPaths = predefinedFrameworkPaths;
 | 
			
		||||
 | 
			
		||||
#ifdef Q_OS_MAC
 | 
			
		||||
    allFrameworkPaths.append(newQtLibsPath);
 | 
			
		||||
    // put QtXXX.framework/Headers directories in include path since that qmake's behavior
 | 
			
		||||
@@ -515,12 +521,6 @@ void Qt4Project::updateCodeModel()
 | 
			
		||||
    }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    FindQt4ProFiles findQt4ProFiles;
 | 
			
		||||
    QList<Qt4ProFileNode *> proFiles = findQt4ProFiles(rootProjectNode());
 | 
			
		||||
    QByteArray definedMacros = predefinedMacros;
 | 
			
		||||
    QStringList allIncludePaths = predefinedIncludePaths;
 | 
			
		||||
    QStringList allFrameworkPaths = predefinedFrameworkPaths;
 | 
			
		||||
 | 
			
		||||
    foreach (Qt4ProFileNode *pro, proFiles) {
 | 
			
		||||
        Internal::CodeModelInfo info;
 | 
			
		||||
        info.defines = predefinedMacros;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user