diff options
| author | Matt Hoosier <matt.hoosier@garmin.com> | 2013-10-17 08:47:46 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-22 12:15:57 +0200 |
| commit | 163bbeb2181bc66683bb836542dc1ea2bcded1fd (patch) | |
| tree | 9c7c775320f265204906bb4ea9afa9ceac4d3432 | |
| parent | 377c7575a7e8acc6030520cb36fe66da3ce43a93 (diff) | |
| -rw-r--r-- | config.tests/unix/ptrsize/ptrsizetest.pro | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro index 045a759ec9..a7ae38a5d9 100644 --- a/config.tests/unix/ptrsize/ptrsizetest.pro +++ b/config.tests/unix/ptrsize/ptrsizetest.pro @@ -1,2 +1,3 @@ SOURCES = ptrsizetest.cpp CONFIG -= qt dylib +CONFIG += debug console diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 757de7b3b0..c3382a5e0a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2353,6 +2353,11 @@ void Configure::autoDetection() if (i.value() == "auto") i.value() = defaultTo(i.key()); } + + if (tryCompileProject("unix/ptrsize")) + dictionary["QT_POINTER_SIZE"] = "8"; + else + dictionary["QT_POINTER_SIZE"] = "4"; } bool Configure::verifyConfiguration() @@ -3411,6 +3416,8 @@ void Configure::generateConfigfiles() if (dictionary["REDUCE_RELOCATIONS"] == "yes") qconfigList += "QT_REDUCE_RELOCATIONS"; if (dictionary["QT_GETIFADDRS"] == "no") qconfigList += "QT_NO_GETIFADDRS"; + qconfigList += QString("QT_POINTER_SIZE=%1").arg(dictionary["QT_POINTER_SIZE"]); + qconfigList.sort(); for (int i = 0; i < qconfigList.count(); ++i) tmpStream << addDefine(qconfigList.at(i)); |