author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qlibrary.cpp | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-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?
-rw-r--r-- | library/qlibrary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/qlibrary.cpp b/library/qlibrary.cpp index 4aabbc5..cbf49a3 100644 --- a/library/qlibrary.cpp +++ b/library/qlibrary.cpp | |||
@@ -1,52 +1,52 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #include "qlibrary_p.h" | 22 | #include "qlibrary_p.h" |
23 | 23 | ||
24 | // uncomment this to get error messages | 24 | // uncomment this to get error messages |
25 | //#define QT_DEBUG_COMPONENT 1 | 25 | //#define QT_DEBUG_COMPONENT 1 |
26 | // uncomment this to get error and success messages | 26 | // uncomment this to get error and success messages |
27 | //#define QT_DEBUG_COMPONENT 2 | 27 | //#define QT_DEBUG_COMPONENT 2 |
28 | 28 | ||
29 | #ifndef QT_DEBUG_COMPONENT | 29 | #ifndef QT_DEBUG_COMPONENT |
30 | # if defined(QT_DEBUG) | 30 | # if defined(QT_DEBUG) |
31 | # define QT_DEBUG_COMPONENT 1 | 31 | # define QT_DEBUG_COMPONENT 1 |
32 | # endif | 32 | # endif |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |
36 | 36 | ||
37 | // KAI C++ has at the moment problems with unloading the Qt plugins. So don't | 37 | // KAI C++ has at the moment problems with unloading the Qt plugins. So don't |
38 | // unload them as a workaround for now. | 38 | // unload them as a workaround for now. |
39 | #if defined(Q_CC_KAI) || defined(Q_OS_MAC) | 39 | #if defined(Q_CC_KAI) || defined(Q_OS_MAC) |
40 | #define QT_NO_LIBRARY_UNLOAD | 40 | #define QT_NO_LIBRARY_UNLOAD |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #if defined(Q_WS_WIN) && !defined(QT_MAKEDLL) | 43 | #if defined(Q_WS_WIN) && !defined(QT_MAKEDLL) |
44 | #define QT_NO_LIBRARY_UNLOAD | 44 | #define QT_NO_LIBRARY_UNLOAD |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | /* Platform independent QLibraryPrivate implementations */ | 47 | /* Platform independent QLibraryPrivate implementations */ |
48 | #ifndef QT_LITE_COMPONENT | 48 | #ifndef QT_LITE_COMPONENT |
49 | 49 | ||
50 | #include "qtimer.h" | 50 | #include "qtimer.h" |
51 | 51 | ||
52 | extern Q_EXPORT QApplication *qApp; | 52 | extern Q_EXPORT QApplication *qApp; |