diff options
| author | Christian Tismer <tismer@stackless.com> | 2015-07-16 16:46:55 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2015-07-16 16:46:55 +0200 |
| commit | cc2e4b0c729175cb10ef7ebe9f68c72e3b7b2c02 (patch) | |
| tree | c904ba93a9b1cbb189244e94edcea2d6a564a426 | |
| parent | 93dbb78c5c1a1f21117b367a15757a9fbdf58a9c (diff) | |
fix naming problem with QtWebKit
This was a tricky bug concerning CamelCase and cmake-caching.
cmake has the habit of remembering the case of variables as they
have been used in a script.
The bad effect is that when a wrong case is tried once, cmake remembers this
and no longer finds the variable with the correct case!
I was about to report a bug, when I finally found the cache file.
| -rw-r--r-- | PySide/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | PySide/global.h.in | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index 45ec2e39..7d57c878 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(Qt5Designer) find_package(Qt5UiTools) find_package(Qt5Test) find_package(Qt5Network) -find_package(Qt5Webkit) +find_package(Qt5WebKit) find_package(Qt5OpenGL) find_package(Qt5Script) find_package(Qt5ScriptTools) @@ -57,13 +57,10 @@ CHECK_PACKAGE_FOUND(Qt5Designer) CHECK_PACKAGE_FOUND(Qt5UiTools) CHECK_PACKAGE_FOUND(Qt5Test) CHECK_PACKAGE_FOUND(Qt5Network) -CHECK_PACKAGE_FOUND(Qt5Webkit) -# Careful: Qt5Webkit_FOUND but Qt5WebKit_INCLUDE_DIRS -# XXX fix this in a better way, and report this to Qt! +CHECK_PACKAGE_FOUND(Qt5WebKit) CHECK_PACKAGE_FOUND(Qt5Script) ### ??? CHECK_PACKAGE_FOUND(Qt5ScriptTools) -### ??? CHECK_PACKAGE_FOUND(Qt5Help) -set(Qt5Help_FOUND 1) +CHECK_PACKAGE_FOUND(Qt5Help) HAS_QT_MODULE(Qt5Core_FOUND QtCore) HAS_QT_MODULE(Qt5Gui_FOUND QtGui) @@ -74,7 +71,7 @@ HAS_QT_MODULE(Qt5Network_FOUND QtNetwork) HAS_QT_MODULE(Qt5Xml_FOUND QtXml) HAS_QT_MODULE(Qt5XmlPatterns_FOUND QtXmlPatterns) HAS_QT_MODULE(Qt5Test_FOUND QtTest) -HAS_QT_MODULE(Qt5Webkit_FOUND QtWebKit) +HAS_QT_MODULE(Qt5WebKit_FOUND QtWebKit) ### # This module is deprecated! It should be replaces by QtGui. @@ -86,7 +83,6 @@ HAS_QT_MODULE(Qt5Webkit_FOUND QtWebKit) if(Qt5Designer_FOUND) HAS_QT_MODULE(Qt5UiTools_FOUND QtUiTools) endif() -### ??? HAS_QT_MODULE(Qt5Help_FOUND QtHelp) HAS_QT_MODULE(Qt5Script_FOUND QtScript) HAS_QT_MODULE(Qt5ScriptTools_FOUND QtScriptTools) HAS_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia) diff --git a/PySide/global.h.in b/PySide/global.h.in index 6c8e76c4..b2d57030 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -421,8 +421,7 @@ namespace QtPrivate { QT_END_NAMESPACE -#if @Qt5Webkit_FOUND@ -// Danger! The macro above has a lower case 'k', the includes are with upper 'K'! +#if @Qt5WebKit_FOUND@ # include <QtWebKit/QtWebKit> #endif |