Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse

Conflicts:
	configure

1 files changed, 0 insertions, 35 deletions

diff --git a/tools/qvfb/translations/translations.pro b/tools/qvfb/translations/translations.pro
deleted file mode 100644
index b0b1af4..0000000
--- a/tools/qvfb/translations/translations.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-# Include those manually as they do not contain any directory specification
-
-FORMS    = ../config.ui
-HEADERS  = ../qvfb.h \
-           ../qvfbview.h \
-           ../qvfbratedlg.h \
-           ../qanimationwriter.h \
-           ../gammaview.h \
-           ../qvfbprotocol.h \
-           ../qvfbshmem.h \
-           ../qvfbmmap.h \
-           ../../../src/gui/embedded/qvfbhdr.h \
-           ../../../src/gui/embedded/qlock_p.h \
-           ../../../src/gui/embedded/qwssignalhandler_p.h \
-           ../../shared/deviceskin/deviceskin.h
-
-SOURCES =  ../qvfb.cpp \
-           ../qvfbview.cpp \
-           ../qvfbratedlg.cpp \
-           ../main.cpp \
-           ../qanimationwriter.cpp \
-           ../qvfbprotocol.cpp \
-           ../qvfbshmem.cpp \
-           ../qvfbmmap.cpp \
-           ../../../src/gui/embedded/qlock.cpp \
-           ../../../src/gui/embedded/qwssignalhandler.cpp \
-           ../../shared/deviceskin/deviceskin.cpp
-
-TR_DIR = $$PWD/../../../translations
-TRANSLATIONS = \
-    $$TR_DIR/qvfb_hu.ts \
-    $$TR_DIR/qvfb_pl.ts \
-    $$TR_DIR/qvfb_ru.ts \
-    $$TR_DIR/qvfb_zh_CN.ts \
-    $$TR_DIR/qvfb_zh_TW.ts