diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 11:30:53 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-12 13:14:30 +0100 |
| commit | eae270cb2e088d1793afeffdff8dcc8ffeb33fdf (patch) | |
| tree | 2ff2bfbf52704ae06c231a89330cea2bdefbd695 | |
| parent | c5714c2eaa912b6928d9edb07aeceba62b9f1ec8 (diff) | |
| parent | d6b64899a00ab96c8bf3aac03acc5a7c2aff28a3 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Icf07a52714047b64da742762dff1b25346a313a9
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/activeqt/container/container.pro | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5de255c..02554ab 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/activeqt/container/container.pro b/src/activeqt/container/container.pro index 3972e5b..904a024 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -9,7 +9,8 @@ HEADERS = ../control/qaxaggregated.h \ qaxobject.h \ qaxscript.h \ qaxselect.h \ - ../shared/qaxtypes.h + ../shared/qaxtypes.h \ + ../shared/qaxutils_p.h SOURCES = qaxbase.cpp \ qaxdump.cpp \ @@ -18,7 +19,8 @@ SOURCES = qaxbase.cpp \ qaxscript.cpp \ qaxscriptwrapper.cpp \ qaxselect.cpp \ - ../shared/qaxtypes.cpp + ../shared/qaxtypes.cpp \ + ../shared/qaxutils.cpp FORMS = qaxselect.ui |