summaryrefslogtreecommitdiff
path: root/library/backend/qpcglobal.h
authorzecke <zecke>2002-09-10 12:09:49 (UTC)
committer zecke <zecke>2002-09-10 12:09:49 (UTC)
commit6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff)
tree6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/backend/qpcglobal.h
parentd10cddb3c9ce75bc90b14add14bc133737fe35aa (diff)
downloadopie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip
opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz
opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2
Qtopia1-6 merge
still to test bic changes to be resolved more changes to be made?
Diffstat (limited to 'library/backend/qpcglobal.h') (more/less context) (ignore whitespace changes)
-rw-r--r--library/backend/qpcglobal.h9
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,50 +1,53 @@
/**********************************************************************
-** 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.
**
** Licensees holding valid Qtopia Developer license may use this
** file in accordance with the Qtopia Developer License Agreement
** provided with the Software.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
** PURPOSE.
**
** email sales@trolltech.com for information about Qtopia License
** Agreements.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef QPC_GLOBAL_H
#define QPC_GLOBAL_H
-#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)
//# undef QPC_MAKEDLL
//# undef QPC_DLL
# if defined(QPC_MAKEDLL) /* create a Qt DLL library */
# if defined(QPC_DLL)
# undef QPC_DLL
# endif
# define QPC_EXPORT __declspec(dllexport)
+# define QPC_TEMPLATEEXTERN
# define QPC_TEMPLATEDLL
# undef QPC_DISABLE_COPY /* avoid unresolved externals */
# elif defined(QPC_DLL) /* use a Qt DLL library */
# define QPC_EXPORT __declspec(dllimport)
+# define QPC_TEMPLATEEXTERN extern
# define QPC_TEMPLATEDLL
# undef QPC_DISABLE_COPY /* avoid unresolved externals */
# endif
#else
# undef QPC_MAKEDLL /* ignore these for other platforms */
# undef QPC_DLL
#endif
#endif
#ifndef QPC_EXPORT
# define QPC_EXPORT
#endif