equal
deleted
inserted
replaced
410 # endif |
410 # endif |
411 /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */ |
411 /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */ |
412 # if defined(__INTEL_COMPILER) |
412 # if defined(__INTEL_COMPILER) |
413 # define Q_CC_INTEL |
413 # define Q_CC_INTEL |
414 # endif |
414 # endif |
415 /* x64 does not support mmx intrinsics on windows */ |
415 /* MSVC does not support SSE/MMX on x64 */ |
416 # if (defined(Q_OS_WIN64) && defined(_M_X64)) |
416 # if (defined(Q_CC_MSVC) && defined(_M_X64)) |
417 # undef QT_HAVE_SSE |
417 # undef QT_HAVE_SSE |
418 # undef QT_HAVE_SSE2 |
|
419 # undef QT_HAVE_MMX |
418 # undef QT_HAVE_MMX |
420 # undef QT_HAVE_3DNOW |
419 # undef QT_HAVE_3DNOW |
421 # endif |
420 # endif |
422 |
|
423 |
421 |
424 #elif defined(__BORLANDC__) || defined(__TURBOC__) |
422 #elif defined(__BORLANDC__) || defined(__TURBOC__) |
425 # define Q_CC_BOR |
423 # define Q_CC_BOR |
426 # define Q_INLINE_TEMPLATE |
424 # define Q_INLINE_TEMPLATE |
427 # if __BORLANDC__ < 0x502 |
425 # if __BORLANDC__ < 0x502 |
1066 |
1064 |
1067 //defines the type for the WNDPROC on windows |
1065 //defines the type for the WNDPROC on windows |
1068 //the alignment needs to be forced for sse2 to not crash with mingw |
1066 //the alignment needs to be forced for sse2 to not crash with mingw |
1069 #if defined(Q_WS_WIN) |
1067 #if defined(Q_WS_WIN) |
1070 # if defined(Q_CC_MINGW) |
1068 # if defined(Q_CC_MINGW) |
1071 # define QT_WIN_CALLBACK CALLBACK __attribute__ ((force_align_arg_pointer)) |
1069 # define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer)) |
1072 # else |
1070 # else |
1073 # define QT_WIN_CALLBACK CALLBACK |
1071 # define QT_ENSURE_STACK_ALIGNED_FOR_SSE |
1074 # endif |
1072 # endif |
|
1073 # define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE |
1075 #endif |
1074 #endif |
1076 |
1075 |
1077 typedef int QNoImplicitBoolCast; |
1076 typedef int QNoImplicitBoolCast; |
1078 |
1077 |
1079 #if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) |
1078 #if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) |
1275 # endif |
1274 # endif |
1276 # if defined(QT_BUILD_COMPAT_LIB) |
1275 # if defined(QT_BUILD_COMPAT_LIB) |
1277 # define Q_COMPAT_EXPORT Q_DECL_EXPORT |
1276 # define Q_COMPAT_EXPORT Q_DECL_EXPORT |
1278 # else |
1277 # else |
1279 # define Q_COMPAT_EXPORT Q_DECL_IMPORT |
1278 # define Q_COMPAT_EXPORT Q_DECL_IMPORT |
|
1279 # endif |
|
1280 # if defined(QT_BUILD_DBUS_LIB) |
|
1281 # define Q_DBUS_EXPORT Q_DECL_EXPORT |
|
1282 # else |
|
1283 # define Q_DBUS_EXPORT Q_DECL_IMPORT |
1280 # endif |
1284 # endif |
1281 # define Q_TEMPLATEDLL |
1285 # define Q_TEMPLATEDLL |
1282 # elif defined(QT_DLL) /* use a Qt DLL library */ |
1286 # elif defined(QT_DLL) /* use a Qt DLL library */ |
1283 # define Q_CORE_EXPORT Q_DECL_IMPORT |
1287 # define Q_CORE_EXPORT Q_DECL_IMPORT |
1284 # define Q_GUI_EXPORT Q_DECL_IMPORT |
1288 # define Q_GUI_EXPORT Q_DECL_IMPORT |
1293 # define Q_XML_EXPORT Q_DECL_IMPORT |
1297 # define Q_XML_EXPORT Q_DECL_IMPORT |
1294 # define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT |
1298 # define Q_XMLPATTERNS_EXPORT Q_DECL_IMPORT |
1295 # define Q_SCRIPT_EXPORT Q_DECL_IMPORT |
1299 # define Q_SCRIPT_EXPORT Q_DECL_IMPORT |
1296 # define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT |
1300 # define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT |
1297 # define Q_COMPAT_EXPORT Q_DECL_IMPORT |
1301 # define Q_COMPAT_EXPORT Q_DECL_IMPORT |
|
1302 # define Q_DBUS_EXPORT Q_DECL_IMPORT |
1298 # define Q_TEMPLATEDLL |
1303 # define Q_TEMPLATEDLL |
1299 # endif |
1304 # endif |
1300 # define Q_NO_DECLARED_NOT_DEFINED |
1305 # define Q_NO_DECLARED_NOT_DEFINED |
1301 #else |
1306 #else |
1302 # if defined(Q_OS_LINUX) && defined(Q_CC_BOR) |
1307 # if defined(Q_OS_LINUX) && defined(Q_CC_BOR) |
1321 # define Q_XML_EXPORT Q_DECL_EXPORT |
1326 # define Q_XML_EXPORT Q_DECL_EXPORT |
1322 # define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT |
1327 # define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT |
1323 # define Q_SCRIPT_EXPORT Q_DECL_EXPORT |
1328 # define Q_SCRIPT_EXPORT Q_DECL_EXPORT |
1324 # define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT |
1329 # define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT |
1325 # define Q_COMPAT_EXPORT Q_DECL_EXPORT |
1330 # define Q_COMPAT_EXPORT Q_DECL_EXPORT |
|
1331 # define Q_DBUS_EXPORT Q_DECL_EXPORT |
1326 # else |
1332 # else |
1327 # define Q_CORE_EXPORT |
1333 # define Q_CORE_EXPORT |
1328 # define Q_GUI_EXPORT |
1334 # define Q_GUI_EXPORT |
1329 # define Q_SQL_EXPORT |
1335 # define Q_SQL_EXPORT |
1330 # define Q_NETWORK_EXPORT |
1336 # define Q_NETWORK_EXPORT |
1335 # define Q_XML_EXPORT |
1341 # define Q_XML_EXPORT |
1336 # define Q_XMLPATTERNS_EXPORT |
1342 # define Q_XMLPATTERNS_EXPORT |
1337 # define Q_SCRIPT_EXPORT |
1343 # define Q_SCRIPT_EXPORT |
1338 # define Q_SCRIPTTOOLS_EXPORT |
1344 # define Q_SCRIPTTOOLS_EXPORT |
1339 # define Q_COMPAT_EXPORT |
1345 # define Q_COMPAT_EXPORT |
|
1346 # define Q_DBUS_EXPORT |
1340 # endif |
1347 # endif |
1341 #endif |
1348 #endif |
1342 |
1349 |
1343 // Functions marked as Q_GUI_EXPORT_INLINE were exported and inlined by mistake. |
1350 // Functions marked as Q_GUI_EXPORT_INLINE were exported and inlined by mistake. |
1344 // Compilers like MinGW complain that the import attribute is ignored. |
1351 // Compilers like MinGW complain that the import attribute is ignored. |
2423 #endif |
2430 #endif |
2424 |
2431 |
2425 #if defined(Q_OS_SYMBIAN) |
2432 #if defined(Q_OS_SYMBIAN) |
2426 |
2433 |
2427 #ifdef SYMBIAN_BUILD_GCE |
2434 #ifdef SYMBIAN_BUILD_GCE |
|
2435 #define Q_SYMBIAN_SUPPORTS_SURFACES |
|
2436 //RWsPointerCursor is fixed, so don't use low performance sprites |
|
2437 #define Q_SYMBIAN_FIXED_POINTER_CURSORS |
2428 #define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE |
2438 #define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE |
2429 #define Q_SYMBIAN_WINDOW_SIZE_CACHE |
2439 #define Q_SYMBIAN_WINDOW_SIZE_CACHE |
2430 #define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER |
2440 #define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER |
2431 |
2441 |
2432 //enabling new graphics resources |
2442 //enabling new graphics resources |