From b18f3e792715bef4f31fea986c2334f57db853ae Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 13 Feb 2013 09:43:05 +0000
Subject: [PATCH] IDE: inherited compiler options: excluded inheritance of
 designtime packages

git-svn-id: trunk@40289 -
---
 ide/ideinfoneedbuild.pas |  2 +-
 ide/project.pp           | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ide/ideinfoneedbuild.pas b/ide/ideinfoneedbuild.pas
index 3680ecfd6d..76b2a9adb8 100644
--- a/ide/ideinfoneedbuild.pas
+++ b/ide/ideinfoneedbuild.pas
@@ -241,13 +241,13 @@ var
   NeedBuildAll: boolean;
   NeedBuild: TModalResult;
 begin
+  SkipDesignTimePackages:=false;
   NewTargets:=GetTargets(TargetComboBox.Text);
   try
     if not HaveSameTargets(FTargets,NewTargets) then begin
       // targets have changed
       ClearTargets;
       if NewTargets=nil then exit(true);
-      SkipDesignTimePackages:=false;
       for i:=0 to NewTargets.Count-1 do begin
         Item:=TInfoNeedBuildItem.Create;
         Item.Target:=TObject(NewTargets[i]);
diff --git a/ide/project.pp b/ide/project.pp
index 13c175dd17..c9116c9405 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -6082,19 +6082,18 @@ procedure TProjectCompilerOptions.GetInheritedCompilerOptions(
   var OptionsList: TFPList);
 var
   PkgList: TFPList;
-  i: Integer;
+  ReqFlags: TPkgIntfRequiredFlags;
 begin
   PkgList:=nil;
-  LazProject.GetAllRequiredPackages(PkgList);
-  if (PkgList<>nil)
-  and (not (pfUseDesignTimePackages in LazProject.Flags)) then begin
-    // remove design time only packages
-    for i:=PkgList.Count-1 downto 0 do
-      if TLazPackage(PkgList[i]).PackageType=lptDesignTime then
-        PkgList.Delete(i);
+  try
+    ReqFlags:=[];
+    if not (pfUseDesignTimePackages in LazProject.Flags) then
+      Include(ReqFlags,pirSkipDesignTimeOnly);
+    LazProject.GetAllRequiredPackages(PkgList,ReqFlags);
+    OptionsList:=GetUsageOptionsList(PkgList);
+  finally
+    PkgList.Free;
   end;
-  OptionsList:=GetUsageOptionsList(PkgList);
-  PkgList.Free;
 end;
 
 { TProjectDefineTemplates }