diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2015-03-10 09:42:28 -0300 |
|---|---|---|
| committer | Rafael Roquetto <rafael.roquetto@kdab.com> | 2015-03-26 21:15:16 +0000 |
| commit | 6a15f68574bc7396d8939e34ed13bf96c18ff486 (patch) | |
| tree | 5147595a164876511ed5f52063b4cc79f6d3888c /tools | |
| parent | cd1cdd1516c7904902e08a26605f9e62032489fe (diff) | |
QNX: Fix compilation on Windows.
This regression was introduced by commit
c3e50db19990c5. It is also necessary to pass QT_NO_SHAREDMEMORY and
QT_NO_SYSTEMSEMAPHORE when building on Windows.
Change-Id: I584cc07de013c5797e096fbda983167268789c8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8544e13ed0..88930cd6c7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3621,7 +3621,11 @@ void Configure::generateConfigfiles() if (dictionary["SQL_SQLITE2"] == "yes") qconfigList += "QT_SQL_SQLITE2"; if (dictionary["SQL_IBASE"] == "yes") qconfigList += "QT_SQL_IBASE"; - if (dictionary["POSIX_IPC"] == "yes") qconfigList += "QT_POSIX_IPC"; + if (dictionary["POSIX_IPC"] == "yes") + qconfigList += "QT_POSIX_IPC"; + else if ((platform() != ANDROID) && (platform() != WINDOWS) && (platform() != WINDOWS_CE) + && (platform() != WINDOWS_RT)) + qconfigList << "QT_NO_SYSTEMSEMAPHORE" << "QT_NO_SHAREDMEMORY"; if (dictionary["FONT_CONFIG"] == "no") qconfigList += "QT_NO_FONTCONFIG"; |