1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Fix compilation on Windows.

Browse Source 
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>
This commit is contained in:
Rafael Roquetto 2015-03-10 09:42:28 -03:00 committed by Rafael Roquetto
parent cd1cdd1516
commit 6a15f68574
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configure/configureapp.cpp
View File

@ -3621,7 +3621,11 @@ void Configure::generateConfigfiles()
if (dictionary["SQL_SQLITE2"] == "yes") qconfigList += "QT_SQL_SQLITE2"; if (dictionary["SQL_SQLITE2"] == "yes") qconfigList += "QT_SQL_SQLITE2";
if (dictionary["SQL_IBASE"] == "yes") qconfigList += "QT_SQL_IBASE"; 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"; if (dictionary["FONT_CONFIG"] == "no") qconfigList += "QT_NO_FONTCONFIG";