diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-03-30 11:28:02 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-03-30 11:28:02 (GMT) |
| commit | 753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7 (patch) | |
| tree | fc1467525883912cc603174cbb55174d9201e4da /src/declarative/graphicsitems/graphicsitems.pri | |
| parent | 9181ba917aa4f842e5c3e8febebe363f4dc11c6f (diff) | |
| parent | 3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (diff) | |
| download | Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.zip Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.gz Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'src/declarative/graphicsitems/graphicsitems.pri')
| -rw-r--r-- | src/declarative/graphicsitems/graphicsitems.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri index d30651b..af76a67 100644 --- a/src/declarative/graphicsitems/graphicsitems.pri +++ b/src/declarative/graphicsitems/graphicsitems.pri @@ -39,6 +39,7 @@ HEADERS += \ $$PWD/qdeclarativerepeater_p.h \ $$PWD/qdeclarativerepeater_p_p.h \ $$PWD/qdeclarativescalegrid_p_p.h \ + $$PWD/qdeclarativetranslate_p.h \ $$PWD/qdeclarativetextinput_p.h \ $$PWD/qdeclarativetextinput_p_p.h \ $$PWD/qdeclarativetextedit_p.h \ @@ -75,6 +76,7 @@ SOURCES += \ $$PWD/qdeclarativerectangle.cpp \ $$PWD/qdeclarativerepeater.cpp \ $$PWD/qdeclarativescalegrid.cpp \ + $$PWD/qdeclarativetranslate.cpp \ $$PWD/qdeclarativetextinput.cpp \ $$PWD/qdeclarativetext.cpp \ $$PWD/qdeclarativetextedit.cpp \ |