diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-13 17:12:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 17:12:28 +0100 |
| commit | 8b76d788604ff4e89198813c542e6bb440b202fb (patch) | |
| tree | 58ddc8738e245a2e05e601b78e04bf8244176993 | |
| parent | 251b76ad92f4bd5d145b37ad0c5a71db279b0e7c (diff) | |
| parent | 0f50ec4cb53593b5dcf155836690055f4bdf6f36 (diff) | |
| download | qttools-8b76d788604ff4e89198813c542e6bb440b202fb.tar.gz | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/designer/src/plugins/plugins.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5de255cb6..02554aba2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,2 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs + +MODULE_VERSION = 5.0.2 diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro index 7cd16f2da..22de8c957 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro @@ -3,4 +3,4 @@ CONFIG += ordered # qtHaveModule(opengl): SUBDIRS += tools/view3d qtHaveModule(webkitwidgets): SUBDIRS += qwebview -# win32: qtHaveModule(activeqt): SUBDIRS += activeqt +win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |