diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:28:22 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:28:22 +0100 |
| commit | 935fd0d0dbdc8d2d7a568c17d1871ac85df3f27b (patch) | |
| tree | 3a46893a432200ea2af73ef4e24ec9dc4fcc1427 | |
| parent | 4d789c3813f965d034b09aba8ec2202b1bc2f421 (diff) | |
| parent | eae270cb2e088d1793afeffdff8dcc8ffeb33fdf (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/activeqt/container/container.pro
Change-Id: Ic830ce2220991e5c43966251a32f5b5032abcd01
| -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 1c42144..27edf66 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -10,7 +10,8 @@ HEADERS = ../control/qaxaggregated.h \ qaxscript.h \ qaxselect.h \ filterwidget_p.h \ - ../shared/qaxtypes.h + ../shared/qaxtypes.h \ + ../shared/qaxutils_p.h SOURCES = qaxbase.cpp \ qaxdump.cpp \ @@ -20,7 +21,8 @@ SOURCES = qaxbase.cpp \ qaxscriptwrapper.cpp \ qaxselect.cpp \ filterwidget.cpp \ - ../shared/qaxtypes.cpp + ../shared/qaxtypes.cpp \ + ../shared/qaxutils.cpp FORMS = qaxselect.ui |