diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-11-28 14:00:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 14:13:57 +0100 |
| commit | 872a278d48982228706ddf151de07c96d90cc73e (patch) | |
| tree | 02b096cd5c6fce73fd3c496c00826bc59c94662b | |
| parent | a3f4613b7fd84ab465a4af0fc94a95e10b5ebc7e (diff) | |
Don't create broken cmake config files.
The inconsistencies in activeqt (in library/module naming header dir
naming etc) mean that create_cmake.prf creates unusable
cmake config files.
Rather than do that, don't create the files at all for now. The user
has a workaround of writing a Find module anyway.
If the libraries are made consistent before Qt 5.0 we can generate the
files, otherwise we can do some more complicated and 'correct' workarounds
to generate correct cmake files in Qt 5.1.
Task-number: QTBUG-27776
Change-Id: Ib185722025dd9fa8eaae84673c8f6221cf7b4b35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/activeqt/axshared.prx | 3 | ||||
| -rw-r--r-- | src/activeqt/container/container.pro | 3 | ||||
| -rw-r--r-- | src/activeqt/control/control.pro | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx index 7a79216..ce383d8 100644 --- a/src/activeqt/axshared.prx +++ b/src/activeqt/axshared.prx @@ -15,3 +15,6 @@ SOURCES = \ MODULE = axbase load(qt_module) +# QtActiveQt is too inconsistent with other Qt modules +# to use the generic cmake config files generator +CONFIG -= create_cmake diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index 07b4eb3..49bc13c 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -30,4 +30,7 @@ MODULE = axcontainer MODULE_CONFIG = dumpcpp CONFIG += no_module_headers load(qt_module) +# QtActiveQt is too inconsistent with other Qt modules +# to use the generic cmake config files generator +CONFIG -= create_cmake DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 41373e3..f3d07cd 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -28,4 +28,7 @@ MODULE_DEFINES = QAXSERVER MODULE_CONFIG = idcidl CONFIG += no_module_headers load(qt_module) +# QtActiveQt is too inconsistent with other Qt modules +# to use the generic cmake config files generator +CONFIG -= create_cmake DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER |