From 4a07f5355d71fe982dadfe36ca9abb16dd9aff39 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 12 Nov 2017 12:49:33 +0000
Subject: [PATCH] LazDataDesktop: Enable MSSQL for FPC 3.0.2 and newer, issue
 #32680, patch from Sven Barth

git-svn-id: trunk@56369 -
---
 components/ideintf/projectintf.pas | 66 +++++++++++++++---------------
 tools/lazdatadesktop/frmmain.pp    |  4 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/components/ideintf/projectintf.pas b/components/ideintf/projectintf.pas
index e3126cd4b4..a1a3718d95 100644
--- a/components/ideintf/projectintf.pas
+++ b/components/ideintf/projectintf.pas
@@ -258,6 +258,34 @@ type
   TProjectSessionStorages = set of TProjectSessionStorage;
 
 const
+  ProjectFlagNames : array[TProjectFlag] of string = (
+      'SaveClosedFiles',
+      'SaveOnlyProjectUnits',
+      'MainUnitIsPascalSource',
+      'MainUnitHasUsesSectionForAllUnits',
+      'MainUnitHasCreateFormStatements',
+      'MainUnitHasTitleStatement',
+      'MainUnitHasScaledStatement',
+      'Runnable',
+      'AlwaysBuild',
+      'UseDesignTimePackages',
+      'LRSInOutputDirectory',
+      'UseDefaultCompilerOptions',
+      'SaveJumpHistory',
+      'SaveFoldState'
+    );
+  ProjectSessionStorageNames: array[TProjectSessionStorage] of string = (
+    'InProjectInfo',
+    'InProjectDir',
+    'InIDEConfig',
+    'None'
+    );
+
+  CompilationExecutableTypeNames: array[TCompilationExecutableType] of string =(
+    'Program',
+    'Library'
+    );
+
   pssHasSeparateSession = [pssInProjectDir,pssInIDEConfig];
   DefaultProjectCleanOutputFileMask = '*';
   DefaultProjectCleanSourcesFileMask = '*.ppu;*.ppl;*.o;*.or';
@@ -549,45 +577,17 @@ function ProjectDescriptorCustomProgram: TProjectDescriptor;
 function ProjectDescriptorEmptyProject: TProjectDescriptor;
 
 const
-  DefaultProjectFlags = [pfSaveClosedUnits,
+  DefaultProjectNoApplicationFlags = [pfSaveClosedUnits,
                          pfMainUnitIsPascalSource,
                          pfMainUnitHasUsesSectionForAllUnits,
-                         pfMainUnitHasCreateFormStatements,
-                         pfMainUnitHasTitleStatement,
-                         pfMainUnitHasScaledStatement,
                          pfRunnable,
                          pfLRSFilesInOutputDirectory,
                          pfSaveJumpHistory,
                          pfSaveFoldState];
-  ProjectFlagNames : array[TProjectFlag] of string = (
-      'SaveClosedFiles',
-      'SaveOnlyProjectUnits',
-      'MainUnitIsPascalSource',
-      'MainUnitHasUsesSectionForAllUnits',
-      'MainUnitHasCreateFormStatements',
-      'MainUnitHasTitleStatement',
-      'MainUnitHasScaledStatement',
-      'Runnable',
-      'AlwaysBuild',
-      'UseDesignTimePackages',
-      'LRSInOutputDirectory',
-      'UseDefaultCompilerOptions',
-      'SaveJumpHistory',
-      'SaveFoldState'
-    );
-
-  ProjectSessionStorageNames: array[TProjectSessionStorage] of string = (
-    'InProjectInfo',
-    'InProjectDir',
-    'InIDEConfig',
-    'None'
-    );
-
-  CompilationExecutableTypeNames: array[TCompilationExecutableType] of string =(
-    'Program',
-    'Library'
-    );
-
+  DefaultProjectFlags = DefaultProjectNoApplicationFlags+[
+                         pfMainUnitHasCreateFormStatements,
+                         pfMainUnitHasTitleStatement,
+                         pfMainUnitHasScaledStatement];
 
 function LoadProjectIconIntoImages(const ProjFile: string;
   const Images: TCustomImageList; const Index: TStringList): Integer;
diff --git a/tools/lazdatadesktop/frmmain.pp b/tools/lazdatadesktop/frmmain.pp
index 1569e908d8..3a130e228b 100644
--- a/tools/lazdatadesktop/frmmain.pp
+++ b/tools/lazdatadesktop/frmmain.pp
@@ -25,8 +25,8 @@
   When done so, add the unit to the uses clause in the implementation, and register it in RegisterDDEngines
 }
 
-{ MS-SQL server connectop}
-{$IFDEF VER3_1_1}
+{ MS-SQL server connection}
+{$IF FPC_FULLVERSION>30001}
 {$DEFINE HAVEMSSQLCONN}
 {$ENDIF}