Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 6 insertions, 3 deletions

diff --git a/library/backend/qpcglobal.h b/library/backend/qpcglobal.h
index 0d60272..7b71f06 100644
--- a/library/backend/qpcglobal.h
+++ b/library/backend/qpcglobal.h
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -24,4 +24,5 @@
 
-#if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER)
 #include <qglobal.h>
+
+#if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER)
 // #  if defined(QT_NODLL)
@@ -34,2 +35,3 @@
 #    define QPC_EXPORT  __declspec(dllexport)
+#    define QPC_TEMPLATEEXTERN
 #    define QPC_TEMPLATEDLL
@@ -38,2 +40,3 @@
 #    define QPC_EXPORT  __declspec(dllimport)
+#    define QPC_TEMPLATEEXTERN extern
 #    define QPC_TEMPLATEDLL