Porting to Qt4

diff --git a/src/STD/STD.h b/src/STD/STD.h
index 404cf9adfd21339b0076dcada68e4aa243b31956..e974b52553aab123b1c967496b287607d8b5bf31 100755 (executable)
--- a/src/STD/STD.h
+++ b/src/STD/STD.h
@@ -19,18 +19,14 @@
 #ifndef STD_H
 #define STD_H
 
-#if defined STD_EXPORTS
 #if defined WIN32
-#define STD_EXPORT             __declspec( dllexport )
+#  if defined STD_EXPORTS
+#    define STD_EXPORT  __declspec( dllexport )
+#  else
+#    define STD_EXPORT  __declspec( dllimport )
+#  endif
 #else
-#define STD_EXPORT
-#endif
-#else
-#if defined WIN32
-#define STD_EXPORT             __declspec( dllimport )
-#else
-#define STD_EXPORT
-#endif
+#  define STD_EXPORT
 #endif
 
 #if defined SOLARIS

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index d8a1e8a4857c1143eabb15d2bf65999407411a73..31b4901f1e3cf85fab8981b39074565b78f51305 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -19,7 +19,7 @@ HEADERS += STD_CloseDlg.h
 HEADERS += STD_MDIDesktop.h
 HEADERS += STD_SDIDesktop.h
 HEADERS += STD_TabDesktop.h
-#SOURCES += STD_LoadStudiesDlg.h
+#HEADERS += STD_LoadStudiesDlg.h
 
 SOURCES  = STD_Application.cxx
 SOURCES += STD_CloseDlg.cxx