forked from qt-creator/qt-creator
		
	Rework the project settings.
This has still a few missing things, but this enough to start getting some feedback. Missing are non qt projects, a solution for the runconfiguration, a missing black line between the treeview on top and the project settings at the bottom. Some flickering with removing/adding widgets to the QScrollArea and not showing the expanded widget if the Details button is right at the bottom.
This commit is contained in:
		@@ -594,7 +594,7 @@ void Qt4Project::updateCodeModel()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        pinfo.defines = predefinedMacros;
 | 
			
		||||
        // pinfo->defines += definedMacros;   // ### FIXME: me
 | 
			
		||||
        pinfo.defines += definedMacros;   // ### FIXME: me
 | 
			
		||||
        pinfo.includePaths = allIncludePaths;
 | 
			
		||||
        pinfo.frameworkPaths = allFrameworkPaths;
 | 
			
		||||
        pinfo.sourceFiles = files;
 | 
			
		||||
@@ -911,14 +911,14 @@ ProjectExplorer::ToolChain::ToolChainType Qt4Project::toolChainType(const QStrin
 | 
			
		||||
    return type;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
BuildStepConfigWidget *Qt4Project::createConfigWidget()
 | 
			
		||||
BuildConfigWidget *Qt4Project::createConfigWidget()
 | 
			
		||||
{
 | 
			
		||||
    return new Qt4ProjectConfigWidget(this);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QList<BuildStepConfigWidget*> Qt4Project::subConfigWidgets()
 | 
			
		||||
QList<BuildConfigWidget*> Qt4Project::subConfigWidgets()
 | 
			
		||||
{
 | 
			
		||||
    QList<BuildStepConfigWidget*> subWidgets;
 | 
			
		||||
    QList<BuildConfigWidget*> subWidgets;
 | 
			
		||||
    subWidgets << new Qt4BuildEnvironmentWidget(this);
 | 
			
		||||
    return subWidgets;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user