diff options
| author | Charles Yin <charles.yin@nokia.com> | 2012-03-13 13:12:09 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 06:08:51 +0100 |
| commit | 703b4a0e20b2eae982ea48e075db480da9851a9a (patch) | |
| tree | baffb382159e4cc6a74f4ca633ae2aae3fb07669 | |
| parent | 3e45d4824611b07835aa7a816d0aee3f5c49e87e (diff) | |
Move variant animation interpolators from QtWidgets to QtGui
There is no reason these interpolators need to stay in QtWidgets library.
Change-Id: I27db49fea2cfd8f0ef417dc52edf66dd1835e7a1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
| -rw-r--r-- | src/gui/animation/animation.pri | 2 | ||||
| -rw-r--r-- | src/gui/animation/qguivariantanimation.cpp (renamed from src/widgets/animation/qguivariantanimation.cpp) | 0 | ||||
| -rw-r--r-- | src/gui/gui.pro | 3 | ||||
| -rw-r--r-- | src/widgets/animation/animation.pri | 3 | ||||
| -rw-r--r-- | src/widgets/widgets.pro | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/animation/animation.pri b/src/gui/animation/animation.pri new file mode 100644 index 0000000000..add9ae7119 --- /dev/null +++ b/src/gui/animation/animation.pri @@ -0,0 +1,2 @@ +SOURCES += \ + animation/qguivariantanimation.cpp diff --git a/src/widgets/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index c344a18b8a..c344a18b8a 100644 --- a/src/widgets/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 2cee31fce1..e6a820b5c4 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -31,6 +31,7 @@ include(painting/painting.pri) include(util/util.pri) include(math3d/math3d.pri) include(opengl/opengl.pri) +include(animation/animation.pri) QMAKE_LIBS += $$QMAKE_LIBS_GUI @@ -150,4 +151,4 @@ win32:!contains(QT_CONFIG, directwrite) { sse2: SOURCES += $$SSE2_SOURCES ssse3: SOURCES += $$SSSE3_SOURCES iwmmxt: SOURCES += $$IWMMXT_SOURCES - } + }
\ No newline at end of file diff --git a/src/widgets/animation/animation.pri b/src/widgets/animation/animation.pri deleted file mode 100644 index 27763ca003..0000000000 --- a/src/widgets/animation/animation.pri +++ /dev/null @@ -1,3 +0,0 @@ -# Qt gui animation module - -SOURCES += animation/qguivariantanimation.cpp diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 8f6a9713f6..596e8a994a 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -25,7 +25,6 @@ mac:include(kernel/mac.pri) win32:include(kernel/win.pri) #modules -include(animation/animation.pri) include(kernel/kernel.pri) include(styles/styles.pri) include(widgets/widgets.pri) |