diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 20:59:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 20:59:55 (GMT) |
| commit | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (patch) | |
| tree | 897daf36e29fbffdd858ae9031dfacf2cea36d8c /src/plugins | |
| parent | 0373325dd1390682922dd07614214c453d473ce3 (diff) | |
| parent | bf04c256c8d39df1206c197821df8913f90bb43c (diff) | |
| download | Qt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.zip Qt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.tar.gz Qt-8ffd45cf6832b67960dbaa10654c4b84358fe3f9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (43 commits)
Fix compilation on Windows: forgot to change one toTime_tHelper
handle qt-format PO flags
handle encoding of PO files
make variable naming politically correct :-D
add Plural-Forms header in PO writer
simplify arabic plural rule
don't mark untranslated messages as fuzzy in PO files
support gettext POT files
fix writing of length variant separators in the singular case
make PO header handling less of a monster hack
fix updating of X-Source-Language PO header
interpret source language "en" as "POSIX" (more precisely: "none specified")
Fix compilation with Sun CC: no semi-colon after Q_ENUM.
Remove the "Insert unicode control character" menu entry on X11.
adds a timeout option to QThreadPool::waitForDone();
Remove leading whitespace from Qt header macros.
Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
Add QDateTime members that operate on 64-bit milliseconds.
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
...
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/nativewifi/platformdefs.h | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/platformdefs_win.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h index 57ae852..d67525a 100644 --- a/src/plugins/bearer/nativewifi/platformdefs.h +++ b/src/plugins/bearer/nativewifi/platformdefs.h @@ -52,6 +52,8 @@ #define WLAN_AVAILABLE_NETWORK_HAS_PROFILE 2 #define DOT11_SSID_MAX_LENGTH 32 +QT_BEGIN_NAMESPACE + struct WLAN_NOTIFICATION_DATA { DWORD NotificationSource; DWORD NotificationCode; @@ -319,4 +321,6 @@ extern WlanScanProto local_WlanScan; extern WlanFreeMemoryProto local_WlanFreeMemory; extern WlanCloseHandleProto local_WlanCloseHandle; +QT_END_NAMESPACE + #endif // PLATFORMDEFS_H diff --git a/src/plugins/bearer/platformdefs_win.h b/src/plugins/bearer/platformdefs_win.h index 37d099c..1a10ba7 100644 --- a/src/plugins/bearer/platformdefs_win.h +++ b/src/plugins/bearer/platformdefs_win.h @@ -47,6 +47,8 @@ #undef interface #include <winioctl.h> +QT_BEGIN_NAMESPACE + #ifndef NS_NLA #define NS_NLA 15 @@ -131,4 +133,6 @@ enum NDIS_PHYSICAL_MEDIUM { #define IOCTL_NDIS_QUERY_GLOBAL_STATS \ CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, 0, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) +QT_END_NAMESPACE + #endif |