diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 11:31:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 13:15:08 +0100 |
| commit | 0f50ec4cb53593b5dcf155836690055f4bdf6f36 (patch) | |
| tree | d19ba004da30fc5ecaf730b2a0ae44947632ee95 | |
| parent | 24f92f79e5d1198e79f4d46489af35999e8e74cf (diff) | |
| parent | b5a32f91f343c2ea905c1af72cb99a854ce81ff0 (diff) | |
| download | qttools-0f50ec4cb53593b5dcf155836690055f4bdf6f36.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I4c19a5f76b8605134aeab29130a20df187f8f107
| -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 |