AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add auto detection for tslib support when using Windows configure.

Browse Source 
Change-Id: I83fb53ed23813e572d924b4c3d5da4aae6f32775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
David Schulz 2015-03-12 14:18:26 +01:00
parent 97f489e7b9
commit 0d5ffd67a4
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/configure/configureapp.cpp
View File

@ -182,6 +182,7 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "QT_ICONV" ] = "auto"; dictionary[ "QT_ICONV" ] = "auto";
dictionary[ "QT_EVDEV" ] = "auto"; dictionary[ "QT_EVDEV" ] = "auto";
dictionary[ "QT_MTDEV" ] = "auto"; dictionary[ "QT_MTDEV" ] = "auto";
dictionary[ "QT_TSLIB" ] = "auto";
dictionary[ "QT_INOTIFY" ] = "auto"; dictionary[ "QT_INOTIFY" ] = "auto";
dictionary[ "QT_EVENTFD" ] = "auto"; dictionary[ "QT_EVENTFD" ] = "auto";
dictionary[ "QT_CUPS" ] = "auto"; dictionary[ "QT_CUPS" ] = "auto";
@ -2274,6 +2275,8 @@ bool Configure::checkAvailability(const QString &part)
available = tryCompileProject("unix/evdev"); available = tryCompileProject("unix/evdev");
} else if (part == "MTDEV") { } else if (part == "MTDEV") {
available = tryCompileProject("unix/mtdev"); available = tryCompileProject("unix/mtdev");
} else if (part == "TSLIB") {
available = tryCompileProject("unix/tslib");
} else if (part == "INOTIFY") { } else if (part == "INOTIFY") {
available = tryCompileProject("unix/inotify"); available = tryCompileProject("unix/inotify");
} else if (part == "QT_EVENTFD") { } else if (part == "QT_EVENTFD") {
@ -2444,6 +2447,10 @@ void Configure::autoDetection()
if (dictionary["QT_MTDEV"] == "auto") if (dictionary["QT_MTDEV"] == "auto")
dictionary["QT_MTDEV"] = checkAvailability("MTDEV") ? "yes" : "no"; dictionary["QT_MTDEV"] = checkAvailability("MTDEV") ? "yes" : "no";
// Detection of tslib support
if (dictionary["QT_TSLIB"] == "auto")
dictionary["QT_TSLIB"] = checkAvailability("TSLIB") ? "yes" : "no";
// Detection of inotify // Detection of inotify
if (dictionary["QT_INOTIFY"] == "auto") if (dictionary["QT_INOTIFY"] == "auto")
dictionary["QT_INOTIFY"] = checkAvailability("INOTIFY") ? "yes" : "no"; dictionary["QT_INOTIFY"] = checkAvailability("INOTIFY") ? "yes" : "no";
@ -2905,6 +2912,9 @@ void Configure::generateOutputVars()
if (dictionary["QT_MTDEV"] == "yes") if (dictionary["QT_MTDEV"] == "yes")
qtConfig += "mtdev"; qtConfig += "mtdev";
if (dictionary[ "QT_TSLIB" ] == "yes")
qtConfig += "tslib";
if (dictionary["QT_INOTIFY"] == "yes") if (dictionary["QT_INOTIFY"] == "yes")
qtConfig += "inotify"; qtConfig += "inotify";
@ -3611,6 +3621,7 @@ void Configure::generateConfigfiles()
if (dictionary["QT_ICONV"] == "no") qconfigList += "QT_NO_ICONV"; if (dictionary["QT_ICONV"] == "no") qconfigList += "QT_NO_ICONV";
if (dictionary["QT_EVDEV"] == "no") qconfigList += "QT_NO_EVDEV"; if (dictionary["QT_EVDEV"] == "no") qconfigList += "QT_NO_EVDEV";
if (dictionary["QT_MTDEV"] == "no") qconfigList += "QT_NO_MTDEV"; if (dictionary["QT_MTDEV"] == "no") qconfigList += "QT_NO_MTDEV";
if (dictionary["QT_TSLIB"] == "no") qconfigList += "QT_NO_TSLIB";
if (dictionary["QT_GLIB"] == "no") qconfigList += "QT_NO_GLIB"; if (dictionary["QT_GLIB"] == "no") qconfigList += "QT_NO_GLIB";
if (dictionary["QT_INOTIFY"] == "no") qconfigList += "QT_NO_INOTIFY"; if (dictionary["QT_INOTIFY"] == "no") qconfigList += "QT_NO_INOTIFY";
if (dictionary["QT_EVENTFD"] == "no") qconfigList += "QT_NO_EVENTFD"; if (dictionary["QT_EVENTFD"] == "no") qconfigList += "QT_NO_EVENTFD";