diff --git a/configure.ac b/configure.ac
index f121cdec17..6c88a7c322 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,7 +191,7 @@ for frontend in $FRONTENDS ; do
     qt)
 	  QT_DO_IT_ALL
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
+	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
 	  RPM_FRONTEND="qt"
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
@@ -467,10 +467,10 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/gtk/Makefile \
        src/frontends/gtk/gimages/Makefile \
        src/frontends/gtk/glade/Makefile \
-       src/frontends/qt2/Makefile \
-       src/frontends/qt2/moc/Makefile \
-       src/frontends/qt2/ui/Makefile \
-       src/frontends/qt2/ui/moc/Makefile \
+       src/frontends/qt3/Makefile \
+       src/frontends/qt3/moc/Makefile \
+       src/frontends/qt3/ui/Makefile \
+       src/frontends/qt3/ui/moc/Makefile \
        src/frontends/qt4/Makefile \
        src/frontends/qt4/moc/Makefile \
        src/frontends/qt4/ui/Makefile \
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index b32e83ad3b..f351b95aad 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -406,7 +406,7 @@ xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
 		}' \
 	${top_srcdir}/src/frontends/xforms/forms/*.fd > $@
 
-qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
+qt_l10n.pot: $(top_srcdir)/src/frontends/qt3/ui/*.ui
 	LC_ALL=C ; export LC_ALL ; \
 	$(AWK) -v top_srcdir="$(top_srcdir)" ' \
 		function fixupfilename() \
@@ -426,7 +426,7 @@ qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
 					fixupfilename(), FNR, line); \
 			} \
 		}' \
-	${top_srcdir}/src/frontends/qt2/ui/*.ui > $@
+	${top_srcdir}/src/frontends/qt3/ui/*.ui > $@
 
 layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
 	LC_ALL=C ; export LC_ALL ; \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7871b4089b..f62c50a8ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,6 @@ src/frontends/controllers/ControlExternal.C
 src/frontends/controllers/ControlGraphics.C
 src/frontends/controllers/ControlInclude.C
 src/frontends/controllers/ControlLog.C
-src/frontends/controllers/ControlViewSource.C
 src/frontends/controllers/ControlPrefs.C
 src/frontends/controllers/ControlPrint.C
 src/frontends/controllers/ControlSpellchecker.C
@@ -48,6 +47,7 @@ src/frontends/gtk/GCitation.C
 src/frontends/gtk/GDocument.C
 src/frontends/gtk/GERT.C
 src/frontends/gtk/GErrorList.C
+src/frontends/gtk/GExternal.C
 src/frontends/gtk/GFloat.C
 src/frontends/gtk/GGraphics.C
 src/frontends/gtk/GInclude.C
@@ -71,53 +71,53 @@ src/frontends/gtk/GToc.C
 src/frontends/gtk/GUrl.C
 src/frontends/gtk/GVSpace.C
 src/frontends/gtk/GWrap.C
-src/frontends/qt2/Alert_pimpl.C
-src/frontends/qt2/BulletsModule.C
-src/frontends/qt2/Dialogs.C
-src/frontends/qt2/FileDialog.C
-src/frontends/qt2/QAbout.C
-src/frontends/qt2/QBibitem.C
-src/frontends/qt2/QBibtex.C
-src/frontends/qt2/QBox.C
-src/frontends/qt2/QBoxDialog.C
-src/frontends/qt2/QBranch.C
-src/frontends/qt2/QChanges.C
-src/frontends/qt2/QCharacter.C
-src/frontends/qt2/QCitation.C
-src/frontends/qt2/QCommandBuffer.C
-src/frontends/qt2/QDelimiterDialog.C
-src/frontends/qt2/QDocument.C
-src/frontends/qt2/QDocumentDialog.C
-src/frontends/qt2/QERT.C
-src/frontends/qt2/QExternal.C
-src/frontends/qt2/QFloat.C
-src/frontends/qt2/QGraphics.C
-src/frontends/qt2/QInclude.C
-src/frontends/qt2/QMath.C
-src/frontends/qt2/QMathDialog.C
-src/frontends/qt2/QMathMatrixDialog.C
-src/frontends/qt2/QNote.C
-src/frontends/qt2/QParagraph.C
-src/frontends/qt2/QPrefs.C
-src/frontends/qt2/QPrefsDialog.C
-src/frontends/qt2/QPrint.C
-src/frontends/qt2/QRef.C
-src/frontends/qt2/QSearch.C
-src/frontends/qt2/QSendto.C
-src/frontends/qt2/QShowFile.C
-src/frontends/qt2/QSpellchecker.C
-src/frontends/qt2/QTabular.C
-src/frontends/qt2/QTabularCreate.C
-src/frontends/qt2/QTexinfo.C
-src/frontends/qt2/QThesaurus.C
-src/frontends/qt2/QToc.C
-src/frontends/qt2/QURL.C
-src/frontends/qt2/QVSpace.C
-src/frontends/qt2/QWrap.C
-src/frontends/qt2/Qt2BC.h
-src/frontends/qt2/QtView.C
-src/frontends/qt2/floatplacement.C
-src/frontends/qt2/validators.C
+src/frontends/qt3/Alert_pimpl.C
+src/frontends/qt3/BulletsModule.C
+src/frontends/qt3/Dialogs.C
+src/frontends/qt3/FileDialog.C
+src/frontends/qt3/QAbout.C
+src/frontends/qt3/QBibitem.C
+src/frontends/qt3/QBibtex.C
+src/frontends/qt3/QBox.C
+src/frontends/qt3/QBoxDialog.C
+src/frontends/qt3/QBranch.C
+src/frontends/qt3/QChanges.C
+src/frontends/qt3/QCharacter.C
+src/frontends/qt3/QCitation.C
+src/frontends/qt3/QCommandBuffer.C
+src/frontends/qt3/QDelimiterDialog.C
+src/frontends/qt3/QDocument.C
+src/frontends/qt3/QDocumentDialog.C
+src/frontends/qt3/QERT.C
+src/frontends/qt3/QExternal.C
+src/frontends/qt3/QFloat.C
+src/frontends/qt3/QGraphics.C
+src/frontends/qt3/QInclude.C
+src/frontends/qt3/QMath.C
+src/frontends/qt3/QMathDialog.C
+src/frontends/qt3/QMathMatrixDialog.C
+src/frontends/qt3/QNote.C
+src/frontends/qt3/QParagraph.C
+src/frontends/qt3/QPrefs.C
+src/frontends/qt3/QPrefsDialog.C
+src/frontends/qt3/QPrint.C
+src/frontends/qt3/QRef.C
+src/frontends/qt3/QSearch.C
+src/frontends/qt3/QSendto.C
+src/frontends/qt3/QShowFile.C
+src/frontends/qt3/QSpellchecker.C
+src/frontends/qt3/QTabular.C
+src/frontends/qt3/QTabularCreate.C
+src/frontends/qt3/QTexinfo.C
+src/frontends/qt3/QThesaurus.C
+src/frontends/qt3/QToc.C
+src/frontends/qt3/QURL.C
+src/frontends/qt3/QVSpace.C
+src/frontends/qt3/QWrap.C
+src/frontends/qt3/Qt2BC.h
+src/frontends/qt3/QtView.C
+src/frontends/qt3/floatplacement.C
+src/frontends/qt3/validators.C
 src/frontends/qt4/Alert_pimpl.C
 src/frontends/qt4/BulletsModule.C
 src/frontends/qt4/Dialogs.C
@@ -131,7 +131,6 @@ src/frontends/qt4/QBranch.C
 src/frontends/qt4/QBranches.C
 src/frontends/qt4/QChanges.C
 src/frontends/qt4/QCharacter.C
-src/frontends/qt4/QCitation.C
 src/frontends/qt4/QCommandBuffer.C
 src/frontends/qt4/QDelimiterDialog.C
 src/frontends/qt4/QDocument.C
@@ -158,7 +157,6 @@ src/frontends/qt4/QTabular.C
 src/frontends/qt4/QTabularCreate.C
 src/frontends/qt4/QTexinfo.C
 src/frontends/qt4/QThesaurus.C
-src/frontends/qt4/QToc.C
 src/frontends/qt4/QURL.C
 src/frontends/qt4/QVSpace.C
 src/frontends/qt4/QWrap.C
diff --git a/src/Makefile.am b/src/Makefile.am
index 8920c7320b..7519df98aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,7 @@ lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
 lyx_xforms_SOURCES = main.C
 
 lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS)
+	frontends/qt3/libqt3.la $(LYX_POST_LIBS) $(OTHERLIBS)
 lyx_qt_SOURCES = main.C
 
 lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index c4e577235d..aba9061230 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
 
-DIST_SUBDIRS = controllers xforms qt2 gtk qt4
+DIST_SUBDIRS = controllers xforms qt3 gtk qt4
 
 EXTRA_DIST = pch.h
 
diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt3/Alert_pimpl.C
similarity index 99%
rename from src/frontends/qt2/Alert_pimpl.C
rename to src/frontends/qt3/Alert_pimpl.C
index 3dadee0320..49b631d001 100644
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt3/Alert_pimpl.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/Alert_pimpl.C
+ * \file qt3/Alert_pimpl.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt3/BulletsModule.C
similarity index 100%
rename from src/frontends/qt2/BulletsModule.C
rename to src/frontends/qt3/BulletsModule.C
diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt3/BulletsModule.h
similarity index 100%
rename from src/frontends/qt2/BulletsModule.h
rename to src/frontends/qt3/BulletsModule.h
diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt3/ChangeLog
similarity index 100%
rename from src/frontends/qt2/ChangeLog
rename to src/frontends/qt3/ChangeLog
diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt3/Dialogs.C
similarity index 99%
rename from src/frontends/qt2/Dialogs.C
rename to src/frontends/qt3/Dialogs.C
index b9c522cd70..415f2b0f3f 100644
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt3/Dialogs.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/Dialogs.C
+ * \file qt3/Dialogs.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt3/FileDialog.C
similarity index 99%
rename from src/frontends/qt2/FileDialog.C
rename to src/frontends/qt3/FileDialog.C
index 1dd4faaa5e..9160319c1b 100644
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt3/FileDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/FileDialog.C
+ * \file qt3/FileDialog.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt3/FileDialog_private.C
similarity index 100%
rename from src/frontends/qt2/FileDialog_private.C
rename to src/frontends/qt3/FileDialog_private.C
diff --git a/src/frontends/qt2/FileDialog_private.h b/src/frontends/qt3/FileDialog_private.h
similarity index 100%
rename from src/frontends/qt2/FileDialog_private.h
rename to src/frontends/qt3/FileDialog_private.h
diff --git a/src/frontends/qt2/LyXKeySymFactory.C b/src/frontends/qt3/LyXKeySymFactory.C
similarity index 92%
rename from src/frontends/qt2/LyXKeySymFactory.C
rename to src/frontends/qt3/LyXKeySymFactory.C
index b73a100127..694c0af1d3 100644
--- a/src/frontends/qt2/LyXKeySymFactory.C
+++ b/src/frontends/qt3/LyXKeySymFactory.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/LyXKeySymFactory.C
+ * \file qt3/LyXKeySymFactory.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/LyXScreenFactory.C b/src/frontends/qt3/LyXScreenFactory.C
similarity index 93%
rename from src/frontends/qt2/LyXScreenFactory.C
rename to src/frontends/qt3/LyXScreenFactory.C
index 6bcb0183d9..be794ccf5e 100644
--- a/src/frontends/qt2/LyXScreenFactory.C
+++ b/src/frontends/qt3/LyXScreenFactory.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/LyXScreenFactory.C
+ * \file qt3/LyXScreenFactory.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt3/Makefile.am
similarity index 92%
rename from src/frontends/qt2/Makefile.am
rename to src/frontends/qt3/Makefile.am
index 05f74b5c04..adf2c281ec 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt3/Makefile.am
@@ -7,10 +7,10 @@ EXTRA_DIST = pch.h Makefile.dialogs
 
 BUILT_SOURCES = $(PCH_FILE)
 
-noinst_LTLIBRARIES = libqt2.la
+noinst_LTLIBRARIES = libqt3.la
 
-libqt2_la_LDFLAGS = $(QT_LDFLAGS)
-libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
+libqt3_la_LDFLAGS = $(QT_LDFLAGS)
+libqt3_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
 
 AM_CPPFLAGS += \
 	$(QT_CPPFLAGS) \
@@ -21,7 +21,7 @@ AM_CPPFLAGS += \
 	$(QT_INCLUDES) $(BOOST_INCLUDES) \
 	-I$(top_srcdir)/src/frontends/controllers
 
-libqt2_la_SOURCES = \
+libqt3_la_SOURCES = \
 	QDialogView.C \
 	QDialogView.h \
 	Alert_pimpl.C \
diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt3/Makefile.dialogs
similarity index 100%
rename from src/frontends/qt2/Makefile.dialogs
rename to src/frontends/qt3/Makefile.dialogs
diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt3/QAbout.C
similarity index 100%
rename from src/frontends/qt2/QAbout.C
rename to src/frontends/qt3/QAbout.C
diff --git a/src/frontends/qt2/QAbout.h b/src/frontends/qt3/QAbout.h
similarity index 100%
rename from src/frontends/qt2/QAbout.h
rename to src/frontends/qt3/QAbout.h
diff --git a/src/frontends/qt2/QAboutDialog.C b/src/frontends/qt3/QAboutDialog.C
similarity index 100%
rename from src/frontends/qt2/QAboutDialog.C
rename to src/frontends/qt3/QAboutDialog.C
diff --git a/src/frontends/qt2/QAboutDialog.h b/src/frontends/qt3/QAboutDialog.h
similarity index 100%
rename from src/frontends/qt2/QAboutDialog.h
rename to src/frontends/qt3/QAboutDialog.h
diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt3/QBibitem.C
similarity index 100%
rename from src/frontends/qt2/QBibitem.C
rename to src/frontends/qt3/QBibitem.C
diff --git a/src/frontends/qt2/QBibitem.h b/src/frontends/qt3/QBibitem.h
similarity index 100%
rename from src/frontends/qt2/QBibitem.h
rename to src/frontends/qt3/QBibitem.h
diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt3/QBibitemDialog.C
similarity index 100%
rename from src/frontends/qt2/QBibitemDialog.C
rename to src/frontends/qt3/QBibitemDialog.C
diff --git a/src/frontends/qt2/QBibitemDialog.h b/src/frontends/qt3/QBibitemDialog.h
similarity index 100%
rename from src/frontends/qt2/QBibitemDialog.h
rename to src/frontends/qt3/QBibitemDialog.h
diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt3/QBibtex.C
similarity index 100%
rename from src/frontends/qt2/QBibtex.C
rename to src/frontends/qt3/QBibtex.C
diff --git a/src/frontends/qt2/QBibtex.h b/src/frontends/qt3/QBibtex.h
similarity index 100%
rename from src/frontends/qt2/QBibtex.h
rename to src/frontends/qt3/QBibtex.h
diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt3/QBibtexDialog.C
similarity index 100%
rename from src/frontends/qt2/QBibtexDialog.C
rename to src/frontends/qt3/QBibtexDialog.C
diff --git a/src/frontends/qt2/QBibtexDialog.h b/src/frontends/qt3/QBibtexDialog.h
similarity index 100%
rename from src/frontends/qt2/QBibtexDialog.h
rename to src/frontends/qt3/QBibtexDialog.h
diff --git a/src/frontends/qt2/QBox.C b/src/frontends/qt3/QBox.C
similarity index 100%
rename from src/frontends/qt2/QBox.C
rename to src/frontends/qt3/QBox.C
diff --git a/src/frontends/qt2/QBox.h b/src/frontends/qt3/QBox.h
similarity index 100%
rename from src/frontends/qt2/QBox.h
rename to src/frontends/qt3/QBox.h
diff --git a/src/frontends/qt2/QBoxDialog.C b/src/frontends/qt3/QBoxDialog.C
similarity index 100%
rename from src/frontends/qt2/QBoxDialog.C
rename to src/frontends/qt3/QBoxDialog.C
diff --git a/src/frontends/qt2/QBoxDialog.h b/src/frontends/qt3/QBoxDialog.h
similarity index 100%
rename from src/frontends/qt2/QBoxDialog.h
rename to src/frontends/qt3/QBoxDialog.h
diff --git a/src/frontends/qt2/QBranch.C b/src/frontends/qt3/QBranch.C
similarity index 100%
rename from src/frontends/qt2/QBranch.C
rename to src/frontends/qt3/QBranch.C
diff --git a/src/frontends/qt2/QBranch.h b/src/frontends/qt3/QBranch.h
similarity index 100%
rename from src/frontends/qt2/QBranch.h
rename to src/frontends/qt3/QBranch.h
diff --git a/src/frontends/qt2/QBranchDialog.C b/src/frontends/qt3/QBranchDialog.C
similarity index 100%
rename from src/frontends/qt2/QBranchDialog.C
rename to src/frontends/qt3/QBranchDialog.C
diff --git a/src/frontends/qt2/QBranchDialog.h b/src/frontends/qt3/QBranchDialog.h
similarity index 100%
rename from src/frontends/qt2/QBranchDialog.h
rename to src/frontends/qt3/QBranchDialog.h
diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt3/QBrowseBox.C
similarity index 100%
rename from src/frontends/qt2/QBrowseBox.C
rename to src/frontends/qt3/QBrowseBox.C
diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt3/QBrowseBox.h
similarity index 100%
rename from src/frontends/qt2/QBrowseBox.h
rename to src/frontends/qt3/QBrowseBox.h
diff --git a/src/frontends/qt2/QChanges.C b/src/frontends/qt3/QChanges.C
similarity index 100%
rename from src/frontends/qt2/QChanges.C
rename to src/frontends/qt3/QChanges.C
diff --git a/src/frontends/qt2/QChanges.h b/src/frontends/qt3/QChanges.h
similarity index 100%
rename from src/frontends/qt2/QChanges.h
rename to src/frontends/qt3/QChanges.h
diff --git a/src/frontends/qt2/QChangesDialog.C b/src/frontends/qt3/QChangesDialog.C
similarity index 100%
rename from src/frontends/qt2/QChangesDialog.C
rename to src/frontends/qt3/QChangesDialog.C
diff --git a/src/frontends/qt2/QChangesDialog.h b/src/frontends/qt3/QChangesDialog.h
similarity index 100%
rename from src/frontends/qt2/QChangesDialog.h
rename to src/frontends/qt3/QChangesDialog.h
diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt3/QCharacter.C
similarity index 100%
rename from src/frontends/qt2/QCharacter.C
rename to src/frontends/qt3/QCharacter.C
diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt3/QCharacter.h
similarity index 100%
rename from src/frontends/qt2/QCharacter.h
rename to src/frontends/qt3/QCharacter.h
diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt3/QCharacterDialog.C
similarity index 100%
rename from src/frontends/qt2/QCharacterDialog.C
rename to src/frontends/qt3/QCharacterDialog.C
diff --git a/src/frontends/qt2/QCharacterDialog.h b/src/frontends/qt3/QCharacterDialog.h
similarity index 100%
rename from src/frontends/qt2/QCharacterDialog.h
rename to src/frontends/qt3/QCharacterDialog.h
diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt3/QCitation.C
similarity index 100%
rename from src/frontends/qt2/QCitation.C
rename to src/frontends/qt3/QCitation.C
diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt3/QCitation.h
similarity index 100%
rename from src/frontends/qt2/QCitation.h
rename to src/frontends/qt3/QCitation.h
diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt3/QCitationDialog.C
similarity index 100%
rename from src/frontends/qt2/QCitationDialog.C
rename to src/frontends/qt3/QCitationDialog.C
diff --git a/src/frontends/qt2/QCitationDialog.h b/src/frontends/qt3/QCitationDialog.h
similarity index 100%
rename from src/frontends/qt2/QCitationDialog.h
rename to src/frontends/qt3/QCitationDialog.h
diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt3/QCommandBuffer.C
similarity index 100%
rename from src/frontends/qt2/QCommandBuffer.C
rename to src/frontends/qt3/QCommandBuffer.C
diff --git a/src/frontends/qt2/QCommandBuffer.h b/src/frontends/qt3/QCommandBuffer.h
similarity index 100%
rename from src/frontends/qt2/QCommandBuffer.h
rename to src/frontends/qt3/QCommandBuffer.h
diff --git a/src/frontends/qt2/QCommandEdit.C b/src/frontends/qt3/QCommandEdit.C
similarity index 100%
rename from src/frontends/qt2/QCommandEdit.C
rename to src/frontends/qt3/QCommandEdit.C
diff --git a/src/frontends/qt2/QCommandEdit.h b/src/frontends/qt3/QCommandEdit.h
similarity index 100%
rename from src/frontends/qt2/QCommandEdit.h
rename to src/frontends/qt3/QCommandEdit.h
diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt3/QContentPane.C
similarity index 100%
rename from src/frontends/qt2/QContentPane.C
rename to src/frontends/qt3/QContentPane.C
diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt3/QContentPane.h
similarity index 100%
rename from src/frontends/qt2/QContentPane.h
rename to src/frontends/qt3/QContentPane.h
diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt3/QDelimiterDialog.C
similarity index 100%
rename from src/frontends/qt2/QDelimiterDialog.C
rename to src/frontends/qt3/QDelimiterDialog.C
diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt3/QDelimiterDialog.h
similarity index 100%
rename from src/frontends/qt2/QDelimiterDialog.h
rename to src/frontends/qt3/QDelimiterDialog.h
diff --git a/src/frontends/qt2/QDialogView.C b/src/frontends/qt3/QDialogView.C
similarity index 100%
rename from src/frontends/qt2/QDialogView.C
rename to src/frontends/qt3/QDialogView.C
diff --git a/src/frontends/qt2/QDialogView.h b/src/frontends/qt3/QDialogView.h
similarity index 100%
rename from src/frontends/qt2/QDialogView.h
rename to src/frontends/qt3/QDialogView.h
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt3/QDocument.C
similarity index 100%
rename from src/frontends/qt2/QDocument.C
rename to src/frontends/qt3/QDocument.C
diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt3/QDocument.h
similarity index 100%
rename from src/frontends/qt2/QDocument.h
rename to src/frontends/qt3/QDocument.h
diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt3/QDocumentDialog.C
similarity index 100%
rename from src/frontends/qt2/QDocumentDialog.C
rename to src/frontends/qt3/QDocumentDialog.C
diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt3/QDocumentDialog.h
similarity index 100%
rename from src/frontends/qt2/QDocumentDialog.h
rename to src/frontends/qt3/QDocumentDialog.h
diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt3/QERT.C
similarity index 100%
rename from src/frontends/qt2/QERT.C
rename to src/frontends/qt3/QERT.C
diff --git a/src/frontends/qt2/QERT.h b/src/frontends/qt3/QERT.h
similarity index 100%
rename from src/frontends/qt2/QERT.h
rename to src/frontends/qt3/QERT.h
diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt3/QERTDialog.C
similarity index 100%
rename from src/frontends/qt2/QERTDialog.C
rename to src/frontends/qt3/QERTDialog.C
diff --git a/src/frontends/qt2/QERTDialog.h b/src/frontends/qt3/QERTDialog.h
similarity index 100%
rename from src/frontends/qt2/QERTDialog.h
rename to src/frontends/qt3/QERTDialog.h
diff --git a/src/frontends/qt2/QErrorList.C b/src/frontends/qt3/QErrorList.C
similarity index 100%
rename from src/frontends/qt2/QErrorList.C
rename to src/frontends/qt3/QErrorList.C
diff --git a/src/frontends/qt2/QErrorList.h b/src/frontends/qt3/QErrorList.h
similarity index 100%
rename from src/frontends/qt2/QErrorList.h
rename to src/frontends/qt3/QErrorList.h
diff --git a/src/frontends/qt2/QErrorListDialog.C b/src/frontends/qt3/QErrorListDialog.C
similarity index 100%
rename from src/frontends/qt2/QErrorListDialog.C
rename to src/frontends/qt3/QErrorListDialog.C
diff --git a/src/frontends/qt2/QErrorListDialog.h b/src/frontends/qt3/QErrorListDialog.h
similarity index 100%
rename from src/frontends/qt2/QErrorListDialog.h
rename to src/frontends/qt3/QErrorListDialog.h
diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt3/QExternal.C
similarity index 100%
rename from src/frontends/qt2/QExternal.C
rename to src/frontends/qt3/QExternal.C
diff --git a/src/frontends/qt2/QExternal.h b/src/frontends/qt3/QExternal.h
similarity index 100%
rename from src/frontends/qt2/QExternal.h
rename to src/frontends/qt3/QExternal.h
diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt3/QExternalDialog.C
similarity index 100%
rename from src/frontends/qt2/QExternalDialog.C
rename to src/frontends/qt3/QExternalDialog.C
diff --git a/src/frontends/qt2/QExternalDialog.h b/src/frontends/qt3/QExternalDialog.h
similarity index 100%
rename from src/frontends/qt2/QExternalDialog.h
rename to src/frontends/qt3/QExternalDialog.h
diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt3/QFloat.C
similarity index 100%
rename from src/frontends/qt2/QFloat.C
rename to src/frontends/qt3/QFloat.C
diff --git a/src/frontends/qt2/QFloat.h b/src/frontends/qt3/QFloat.h
similarity index 100%
rename from src/frontends/qt2/QFloat.h
rename to src/frontends/qt3/QFloat.h
diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt3/QFloatDialog.C
similarity index 100%
rename from src/frontends/qt2/QFloatDialog.C
rename to src/frontends/qt3/QFloatDialog.C
diff --git a/src/frontends/qt2/QFloatDialog.h b/src/frontends/qt3/QFloatDialog.h
similarity index 100%
rename from src/frontends/qt2/QFloatDialog.h
rename to src/frontends/qt3/QFloatDialog.h
diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt3/QGraphics.C
similarity index 100%
rename from src/frontends/qt2/QGraphics.C
rename to src/frontends/qt3/QGraphics.C
diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt3/QGraphics.h
similarity index 100%
rename from src/frontends/qt2/QGraphics.h
rename to src/frontends/qt3/QGraphics.h
diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt3/QGraphicsDialog.C
similarity index 100%
rename from src/frontends/qt2/QGraphicsDialog.C
rename to src/frontends/qt3/QGraphicsDialog.C
diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt3/QGraphicsDialog.h
similarity index 100%
rename from src/frontends/qt2/QGraphicsDialog.h
rename to src/frontends/qt3/QGraphicsDialog.h
diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt3/QInclude.C
similarity index 100%
rename from src/frontends/qt2/QInclude.C
rename to src/frontends/qt3/QInclude.C
diff --git a/src/frontends/qt2/QInclude.h b/src/frontends/qt3/QInclude.h
similarity index 100%
rename from src/frontends/qt2/QInclude.h
rename to src/frontends/qt3/QInclude.h
diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt3/QIncludeDialog.C
similarity index 100%
rename from src/frontends/qt2/QIncludeDialog.C
rename to src/frontends/qt3/QIncludeDialog.C
diff --git a/src/frontends/qt2/QIncludeDialog.h b/src/frontends/qt3/QIncludeDialog.h
similarity index 100%
rename from src/frontends/qt2/QIncludeDialog.h
rename to src/frontends/qt3/QIncludeDialog.h
diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt3/QIndex.C
similarity index 100%
rename from src/frontends/qt2/QIndex.C
rename to src/frontends/qt3/QIndex.C
diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt3/QIndex.h
similarity index 100%
rename from src/frontends/qt2/QIndex.h
rename to src/frontends/qt3/QIndex.h
diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt3/QIndexDialog.C
similarity index 100%
rename from src/frontends/qt2/QIndexDialog.C
rename to src/frontends/qt3/QIndexDialog.C
diff --git a/src/frontends/qt2/QIndexDialog.h b/src/frontends/qt3/QIndexDialog.h
similarity index 100%
rename from src/frontends/qt2/QIndexDialog.h
rename to src/frontends/qt3/QIndexDialog.h
diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt3/QLImage.C
similarity index 100%
rename from src/frontends/qt2/QLImage.C
rename to src/frontends/qt3/QLImage.C
diff --git a/src/frontends/qt2/QLImage.h b/src/frontends/qt3/QLImage.h
similarity index 100%
rename from src/frontends/qt2/QLImage.h
rename to src/frontends/qt3/QLImage.h
diff --git a/src/frontends/qt2/QLMenubar.C b/src/frontends/qt3/QLMenubar.C
similarity index 99%
rename from src/frontends/qt2/QLMenubar.C
rename to src/frontends/qt3/QLMenubar.C
index 60780a6702..790107280c 100644
--- a/src/frontends/qt2/QLMenubar.C
+++ b/src/frontends/qt3/QLMenubar.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/QLMenubar.C
+ * \file qt3/QLMenubar.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/QLMenubar.h b/src/frontends/qt3/QLMenubar.h
similarity index 97%
rename from src/frontends/qt2/QLMenubar.h
rename to src/frontends/qt3/QLMenubar.h
index 2cd740fc08..1a6d5aab3e 100644
--- a/src/frontends/qt2/QLMenubar.h
+++ b/src/frontends/qt3/QLMenubar.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt2/QLMenubar.h
+ * \file qt3/QLMenubar.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt3/QLPainter.C
similarity index 100%
rename from src/frontends/qt2/QLPainter.C
rename to src/frontends/qt3/QLPainter.C
diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt3/QLPainter.h
similarity index 100%
rename from src/frontends/qt2/QLPainter.h
rename to src/frontends/qt3/QLPainter.h
diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt3/QLPopupMenu.C
similarity index 100%
rename from src/frontends/qt2/QLPopupMenu.C
rename to src/frontends/qt3/QLPopupMenu.C
diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt3/QLPopupMenu.h
similarity index 100%
rename from src/frontends/qt2/QLPopupMenu.h
rename to src/frontends/qt3/QLPopupMenu.h
diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt3/QLPrintDialog.C
similarity index 100%
rename from src/frontends/qt2/QLPrintDialog.C
rename to src/frontends/qt3/QLPrintDialog.C
diff --git a/src/frontends/qt2/QLPrintDialog.h b/src/frontends/qt3/QLPrintDialog.h
similarity index 100%
rename from src/frontends/qt2/QLPrintDialog.h
rename to src/frontends/qt3/QLPrintDialog.h
diff --git a/src/frontends/qt2/QLToolbar.C b/src/frontends/qt3/QLToolbar.C
similarity index 99%
rename from src/frontends/qt2/QLToolbar.C
rename to src/frontends/qt3/QLToolbar.C
index 11ae6e5a9d..07d1fc8efc 100644
--- a/src/frontends/qt2/QLToolbar.C
+++ b/src/frontends/qt3/QLToolbar.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/QLToolbar.C
+ * \file qt3/QLToolbar.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/QLToolbar.h b/src/frontends/qt3/QLToolbar.h
similarity index 100%
rename from src/frontends/qt2/QLToolbar.h
rename to src/frontends/qt3/QLToolbar.h
diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt3/QLog.C
similarity index 100%
rename from src/frontends/qt2/QLog.C
rename to src/frontends/qt3/QLog.C
diff --git a/src/frontends/qt2/QLog.h b/src/frontends/qt3/QLog.h
similarity index 100%
rename from src/frontends/qt2/QLog.h
rename to src/frontends/qt3/QLog.h
diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt3/QLogDialog.C
similarity index 100%
rename from src/frontends/qt2/QLogDialog.C
rename to src/frontends/qt3/QLogDialog.C
diff --git a/src/frontends/qt2/QLogDialog.h b/src/frontends/qt3/QLogDialog.h
similarity index 100%
rename from src/frontends/qt2/QLogDialog.h
rename to src/frontends/qt3/QLogDialog.h
diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt3/QLyXKeySym.C
similarity index 100%
rename from src/frontends/qt2/QLyXKeySym.C
rename to src/frontends/qt3/QLyXKeySym.C
diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt3/QLyXKeySym.h
similarity index 100%
rename from src/frontends/qt2/QLyXKeySym.h
rename to src/frontends/qt3/QLyXKeySym.h
diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt3/QMath.C
similarity index 100%
rename from src/frontends/qt2/QMath.C
rename to src/frontends/qt3/QMath.C
diff --git a/src/frontends/qt2/QMath.h b/src/frontends/qt3/QMath.h
similarity index 100%
rename from src/frontends/qt2/QMath.h
rename to src/frontends/qt3/QMath.h
diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt3/QMathDialog.C
similarity index 100%
rename from src/frontends/qt2/QMathDialog.C
rename to src/frontends/qt3/QMathDialog.C
diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt3/QMathDialog.h
similarity index 100%
rename from src/frontends/qt2/QMathDialog.h
rename to src/frontends/qt3/QMathDialog.h
diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt3/QMathMatrixDialog.C
similarity index 100%
rename from src/frontends/qt2/QMathMatrixDialog.C
rename to src/frontends/qt3/QMathMatrixDialog.C
diff --git a/src/frontends/qt2/QMathMatrixDialog.h b/src/frontends/qt3/QMathMatrixDialog.h
similarity index 100%
rename from src/frontends/qt2/QMathMatrixDialog.h
rename to src/frontends/qt3/QMathMatrixDialog.h
diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt3/QNote.C
similarity index 100%
rename from src/frontends/qt2/QNote.C
rename to src/frontends/qt3/QNote.C
diff --git a/src/frontends/qt2/QNote.h b/src/frontends/qt3/QNote.h
similarity index 100%
rename from src/frontends/qt2/QNote.h
rename to src/frontends/qt3/QNote.h
diff --git a/src/frontends/qt2/QNoteDialog.C b/src/frontends/qt3/QNoteDialog.C
similarity index 100%
rename from src/frontends/qt2/QNoteDialog.C
rename to src/frontends/qt3/QNoteDialog.C
diff --git a/src/frontends/qt2/QNoteDialog.h b/src/frontends/qt3/QNoteDialog.h
similarity index 100%
rename from src/frontends/qt2/QNoteDialog.h
rename to src/frontends/qt3/QNoteDialog.h
diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt3/QParagraph.C
similarity index 100%
rename from src/frontends/qt2/QParagraph.C
rename to src/frontends/qt3/QParagraph.C
diff --git a/src/frontends/qt2/QParagraph.h b/src/frontends/qt3/QParagraph.h
similarity index 100%
rename from src/frontends/qt2/QParagraph.h
rename to src/frontends/qt3/QParagraph.h
diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt3/QParagraphDialog.C
similarity index 100%
rename from src/frontends/qt2/QParagraphDialog.C
rename to src/frontends/qt3/QParagraphDialog.C
diff --git a/src/frontends/qt2/QParagraphDialog.h b/src/frontends/qt3/QParagraphDialog.h
similarity index 100%
rename from src/frontends/qt2/QParagraphDialog.h
rename to src/frontends/qt3/QParagraphDialog.h
diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt3/QPrefs.C
similarity index 100%
rename from src/frontends/qt2/QPrefs.C
rename to src/frontends/qt3/QPrefs.C
diff --git a/src/frontends/qt2/QPrefs.h b/src/frontends/qt3/QPrefs.h
similarity index 100%
rename from src/frontends/qt2/QPrefs.h
rename to src/frontends/qt3/QPrefs.h
diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt3/QPrefsDialog.C
similarity index 100%
rename from src/frontends/qt2/QPrefsDialog.C
rename to src/frontends/qt3/QPrefsDialog.C
diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt3/QPrefsDialog.h
similarity index 100%
rename from src/frontends/qt2/QPrefsDialog.h
rename to src/frontends/qt3/QPrefsDialog.h
diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt3/QPrint.C
similarity index 100%
rename from src/frontends/qt2/QPrint.C
rename to src/frontends/qt3/QPrint.C
diff --git a/src/frontends/qt2/QPrint.h b/src/frontends/qt3/QPrint.h
similarity index 100%
rename from src/frontends/qt2/QPrint.h
rename to src/frontends/qt3/QPrint.h
diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt3/QRef.C
similarity index 100%
rename from src/frontends/qt2/QRef.C
rename to src/frontends/qt3/QRef.C
diff --git a/src/frontends/qt2/QRef.h b/src/frontends/qt3/QRef.h
similarity index 100%
rename from src/frontends/qt2/QRef.h
rename to src/frontends/qt3/QRef.h
diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt3/QRefDialog.C
similarity index 100%
rename from src/frontends/qt2/QRefDialog.C
rename to src/frontends/qt3/QRefDialog.C
diff --git a/src/frontends/qt2/QRefDialog.h b/src/frontends/qt3/QRefDialog.h
similarity index 100%
rename from src/frontends/qt2/QRefDialog.h
rename to src/frontends/qt3/QRefDialog.h
diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt3/QSearch.C
similarity index 100%
rename from src/frontends/qt2/QSearch.C
rename to src/frontends/qt3/QSearch.C
diff --git a/src/frontends/qt2/QSearch.h b/src/frontends/qt3/QSearch.h
similarity index 100%
rename from src/frontends/qt2/QSearch.h
rename to src/frontends/qt3/QSearch.h
diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt3/QSearchDialog.C
similarity index 100%
rename from src/frontends/qt2/QSearchDialog.C
rename to src/frontends/qt3/QSearchDialog.C
diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt3/QSearchDialog.h
similarity index 100%
rename from src/frontends/qt2/QSearchDialog.h
rename to src/frontends/qt3/QSearchDialog.h
diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt3/QSendto.C
similarity index 100%
rename from src/frontends/qt2/QSendto.C
rename to src/frontends/qt3/QSendto.C
diff --git a/src/frontends/qt2/QSendto.h b/src/frontends/qt3/QSendto.h
similarity index 100%
rename from src/frontends/qt2/QSendto.h
rename to src/frontends/qt3/QSendto.h
diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt3/QSendtoDialog.C
similarity index 100%
rename from src/frontends/qt2/QSendtoDialog.C
rename to src/frontends/qt3/QSendtoDialog.C
diff --git a/src/frontends/qt2/QSendtoDialog.h b/src/frontends/qt3/QSendtoDialog.h
similarity index 100%
rename from src/frontends/qt2/QSendtoDialog.h
rename to src/frontends/qt3/QSendtoDialog.h
diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt3/QShowFile.C
similarity index 100%
rename from src/frontends/qt2/QShowFile.C
rename to src/frontends/qt3/QShowFile.C
diff --git a/src/frontends/qt2/QShowFile.h b/src/frontends/qt3/QShowFile.h
similarity index 100%
rename from src/frontends/qt2/QShowFile.h
rename to src/frontends/qt3/QShowFile.h
diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt3/QShowFileDialog.C
similarity index 100%
rename from src/frontends/qt2/QShowFileDialog.C
rename to src/frontends/qt3/QShowFileDialog.C
diff --git a/src/frontends/qt2/QShowFileDialog.h b/src/frontends/qt3/QShowFileDialog.h
similarity index 100%
rename from src/frontends/qt2/QShowFileDialog.h
rename to src/frontends/qt3/QShowFileDialog.h
diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt3/QSpellchecker.C
similarity index 100%
rename from src/frontends/qt2/QSpellchecker.C
rename to src/frontends/qt3/QSpellchecker.C
diff --git a/src/frontends/qt2/QSpellchecker.h b/src/frontends/qt3/QSpellchecker.h
similarity index 100%
rename from src/frontends/qt2/QSpellchecker.h
rename to src/frontends/qt3/QSpellchecker.h
diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt3/QSpellcheckerDialog.C
similarity index 100%
rename from src/frontends/qt2/QSpellcheckerDialog.C
rename to src/frontends/qt3/QSpellcheckerDialog.C
diff --git a/src/frontends/qt2/QSpellcheckerDialog.h b/src/frontends/qt3/QSpellcheckerDialog.h
similarity index 100%
rename from src/frontends/qt2/QSpellcheckerDialog.h
rename to src/frontends/qt3/QSpellcheckerDialog.h
diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt3/QTabular.C
similarity index 100%
rename from src/frontends/qt2/QTabular.C
rename to src/frontends/qt3/QTabular.C
diff --git a/src/frontends/qt2/QTabular.h b/src/frontends/qt3/QTabular.h
similarity index 100%
rename from src/frontends/qt2/QTabular.h
rename to src/frontends/qt3/QTabular.h
diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt3/QTabularCreate.C
similarity index 100%
rename from src/frontends/qt2/QTabularCreate.C
rename to src/frontends/qt3/QTabularCreate.C
diff --git a/src/frontends/qt2/QTabularCreate.h b/src/frontends/qt3/QTabularCreate.h
similarity index 100%
rename from src/frontends/qt2/QTabularCreate.h
rename to src/frontends/qt3/QTabularCreate.h
diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt3/QTabularCreateDialog.C
similarity index 100%
rename from src/frontends/qt2/QTabularCreateDialog.C
rename to src/frontends/qt3/QTabularCreateDialog.C
diff --git a/src/frontends/qt2/QTabularCreateDialog.h b/src/frontends/qt3/QTabularCreateDialog.h
similarity index 100%
rename from src/frontends/qt2/QTabularCreateDialog.h
rename to src/frontends/qt3/QTabularCreateDialog.h
diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt3/QTabularDialog.C
similarity index 100%
rename from src/frontends/qt2/QTabularDialog.C
rename to src/frontends/qt3/QTabularDialog.C
diff --git a/src/frontends/qt2/QTabularDialog.h b/src/frontends/qt3/QTabularDialog.h
similarity index 100%
rename from src/frontends/qt2/QTabularDialog.h
rename to src/frontends/qt3/QTabularDialog.h
diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt3/QTexinfo.C
similarity index 100%
rename from src/frontends/qt2/QTexinfo.C
rename to src/frontends/qt3/QTexinfo.C
diff --git a/src/frontends/qt2/QTexinfo.h b/src/frontends/qt3/QTexinfo.h
similarity index 100%
rename from src/frontends/qt2/QTexinfo.h
rename to src/frontends/qt3/QTexinfo.h
diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt3/QTexinfoDialog.C
similarity index 100%
rename from src/frontends/qt2/QTexinfoDialog.C
rename to src/frontends/qt3/QTexinfoDialog.C
diff --git a/src/frontends/qt2/QTexinfoDialog.h b/src/frontends/qt3/QTexinfoDialog.h
similarity index 100%
rename from src/frontends/qt2/QTexinfoDialog.h
rename to src/frontends/qt3/QTexinfoDialog.h
diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt3/QThesaurus.C
similarity index 100%
rename from src/frontends/qt2/QThesaurus.C
rename to src/frontends/qt3/QThesaurus.C
diff --git a/src/frontends/qt2/QThesaurus.h b/src/frontends/qt3/QThesaurus.h
similarity index 100%
rename from src/frontends/qt2/QThesaurus.h
rename to src/frontends/qt3/QThesaurus.h
diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt3/QThesaurusDialog.C
similarity index 100%
rename from src/frontends/qt2/QThesaurusDialog.C
rename to src/frontends/qt3/QThesaurusDialog.C
diff --git a/src/frontends/qt2/QThesaurusDialog.h b/src/frontends/qt3/QThesaurusDialog.h
similarity index 100%
rename from src/frontends/qt2/QThesaurusDialog.h
rename to src/frontends/qt3/QThesaurusDialog.h
diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt3/QToc.C
similarity index 100%
rename from src/frontends/qt2/QToc.C
rename to src/frontends/qt3/QToc.C
diff --git a/src/frontends/qt2/QToc.h b/src/frontends/qt3/QToc.h
similarity index 100%
rename from src/frontends/qt2/QToc.h
rename to src/frontends/qt3/QToc.h
diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt3/QTocDialog.C
similarity index 100%
rename from src/frontends/qt2/QTocDialog.C
rename to src/frontends/qt3/QTocDialog.C
diff --git a/src/frontends/qt2/QTocDialog.h b/src/frontends/qt3/QTocDialog.h
similarity index 100%
rename from src/frontends/qt2/QTocDialog.h
rename to src/frontends/qt3/QTocDialog.h
diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt3/QURL.C
similarity index 100%
rename from src/frontends/qt2/QURL.C
rename to src/frontends/qt3/QURL.C
diff --git a/src/frontends/qt2/QURL.h b/src/frontends/qt3/QURL.h
similarity index 100%
rename from src/frontends/qt2/QURL.h
rename to src/frontends/qt3/QURL.h
diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt3/QURLDialog.C
similarity index 100%
rename from src/frontends/qt2/QURLDialog.C
rename to src/frontends/qt3/QURLDialog.C
diff --git a/src/frontends/qt2/QURLDialog.h b/src/frontends/qt3/QURLDialog.h
similarity index 100%
rename from src/frontends/qt2/QURLDialog.h
rename to src/frontends/qt3/QURLDialog.h
diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt3/QVSpace.C
similarity index 100%
rename from src/frontends/qt2/QVSpace.C
rename to src/frontends/qt3/QVSpace.C
diff --git a/src/frontends/qt2/QVSpace.h b/src/frontends/qt3/QVSpace.h
similarity index 100%
rename from src/frontends/qt2/QVSpace.h
rename to src/frontends/qt3/QVSpace.h
diff --git a/src/frontends/qt2/QVSpaceDialog.C b/src/frontends/qt3/QVSpaceDialog.C
similarity index 100%
rename from src/frontends/qt2/QVSpaceDialog.C
rename to src/frontends/qt3/QVSpaceDialog.C
diff --git a/src/frontends/qt2/QVSpaceDialog.h b/src/frontends/qt3/QVSpaceDialog.h
similarity index 100%
rename from src/frontends/qt2/QVSpaceDialog.h
rename to src/frontends/qt3/QVSpaceDialog.h
diff --git a/src/frontends/qt2/QViewSource.C b/src/frontends/qt3/QViewSource.C
similarity index 100%
rename from src/frontends/qt2/QViewSource.C
rename to src/frontends/qt3/QViewSource.C
diff --git a/src/frontends/qt2/QViewSource.h b/src/frontends/qt3/QViewSource.h
similarity index 100%
rename from src/frontends/qt2/QViewSource.h
rename to src/frontends/qt3/QViewSource.h
diff --git a/src/frontends/qt2/QViewSourceDialog.C b/src/frontends/qt3/QViewSourceDialog.C
similarity index 100%
rename from src/frontends/qt2/QViewSourceDialog.C
rename to src/frontends/qt3/QViewSourceDialog.C
diff --git a/src/frontends/qt2/QViewSourceDialog.h b/src/frontends/qt3/QViewSourceDialog.h
similarity index 100%
rename from src/frontends/qt2/QViewSourceDialog.h
rename to src/frontends/qt3/QViewSourceDialog.h
diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt3/QWorkArea.C
similarity index 100%
rename from src/frontends/qt2/QWorkArea.C
rename to src/frontends/qt3/QWorkArea.C
diff --git a/src/frontends/qt2/QWorkArea.h b/src/frontends/qt3/QWorkArea.h
similarity index 100%
rename from src/frontends/qt2/QWorkArea.h
rename to src/frontends/qt3/QWorkArea.h
diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt3/QWrap.C
similarity index 100%
rename from src/frontends/qt2/QWrap.C
rename to src/frontends/qt3/QWrap.C
diff --git a/src/frontends/qt2/QWrap.h b/src/frontends/qt3/QWrap.h
similarity index 100%
rename from src/frontends/qt2/QWrap.h
rename to src/frontends/qt3/QWrap.h
diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt3/QWrapDialog.C
similarity index 100%
rename from src/frontends/qt2/QWrapDialog.C
rename to src/frontends/qt3/QWrapDialog.C
diff --git a/src/frontends/qt2/QWrapDialog.h b/src/frontends/qt3/QWrapDialog.h
similarity index 100%
rename from src/frontends/qt2/QWrapDialog.h
rename to src/frontends/qt3/QWrapDialog.h
diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt3/Qt2BC.C
similarity index 100%
rename from src/frontends/qt2/Qt2BC.C
rename to src/frontends/qt3/Qt2BC.C
diff --git a/src/frontends/qt2/Qt2BC.h b/src/frontends/qt3/Qt2BC.h
similarity index 100%
rename from src/frontends/qt2/Qt2BC.h
rename to src/frontends/qt3/Qt2BC.h
diff --git a/src/frontends/qt2/QtLyXView.h b/src/frontends/qt3/QtLyXView.h
similarity index 100%
rename from src/frontends/qt2/QtLyXView.h
rename to src/frontends/qt3/QtLyXView.h
diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt3/QtView.C
similarity index 100%
rename from src/frontends/qt2/QtView.C
rename to src/frontends/qt3/QtView.C
diff --git a/src/frontends/qt2/QtView.h b/src/frontends/qt3/QtView.h
similarity index 100%
rename from src/frontends/qt2/QtView.h
rename to src/frontends/qt3/QtView.h
diff --git a/src/frontends/qt2/README b/src/frontends/qt3/README
similarity index 100%
rename from src/frontends/qt2/README
rename to src/frontends/qt3/README
diff --git a/src/frontends/qt2/WorkAreaFactory.C b/src/frontends/qt3/WorkAreaFactory.C
similarity index 93%
rename from src/frontends/qt2/WorkAreaFactory.C
rename to src/frontends/qt3/WorkAreaFactory.C
index 3277a944cf..054fee2b29 100644
--- a/src/frontends/qt2/WorkAreaFactory.C
+++ b/src/frontends/qt3/WorkAreaFactory.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/WorkAreaFactory.C
+ * \file qt3/WorkAreaFactory.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/checkedwidgets.C b/src/frontends/qt3/checkedwidgets.C
similarity index 98%
rename from src/frontends/qt2/checkedwidgets.C
rename to src/frontends/qt3/checkedwidgets.C
index ea552d3e89..11059e7b3f 100644
--- a/src/frontends/qt2/checkedwidgets.C
+++ b/src/frontends/qt3/checkedwidgets.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/checkedwidgets.C
+ * \file qt3/checkedwidgets.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/checkedwidgets.h b/src/frontends/qt3/checkedwidgets.h
similarity index 96%
rename from src/frontends/qt2/checkedwidgets.h
rename to src/frontends/qt3/checkedwidgets.h
index 8e0814a4ce..b5bada92c9 100644
--- a/src/frontends/qt2/checkedwidgets.h
+++ b/src/frontends/qt3/checkedwidgets.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt2/checkedwidgets.h
+ * \file qt3/checkedwidgets.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt3/emptytable.C
similarity index 100%
rename from src/frontends/qt2/emptytable.C
rename to src/frontends/qt3/emptytable.C
diff --git a/src/frontends/qt2/emptytable.h b/src/frontends/qt3/emptytable.h
similarity index 100%
rename from src/frontends/qt2/emptytable.h
rename to src/frontends/qt3/emptytable.h
diff --git a/src/frontends/qt2/floatplacement.C b/src/frontends/qt3/floatplacement.C
similarity index 100%
rename from src/frontends/qt2/floatplacement.C
rename to src/frontends/qt3/floatplacement.C
diff --git a/src/frontends/qt2/floatplacement.h b/src/frontends/qt3/floatplacement.h
similarity index 100%
rename from src/frontends/qt2/floatplacement.h
rename to src/frontends/qt3/floatplacement.h
diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt3/iconpalette.C
similarity index 100%
rename from src/frontends/qt2/iconpalette.C
rename to src/frontends/qt3/iconpalette.C
diff --git a/src/frontends/qt2/iconpalette.h b/src/frontends/qt3/iconpalette.h
similarity index 100%
rename from src/frontends/qt2/iconpalette.h
rename to src/frontends/qt3/iconpalette.h
diff --git a/src/frontends/qt2/lcolorcache.C b/src/frontends/qt3/lcolorcache.C
similarity index 100%
rename from src/frontends/qt2/lcolorcache.C
rename to src/frontends/qt3/lcolorcache.C
diff --git a/src/frontends/qt2/lcolorcache.h b/src/frontends/qt3/lcolorcache.h
similarity index 100%
rename from src/frontends/qt2/lcolorcache.h
rename to src/frontends/qt3/lcolorcache.h
diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt3/lengthcombo.C
similarity index 100%
rename from src/frontends/qt2/lengthcombo.C
rename to src/frontends/qt3/lengthcombo.C
diff --git a/src/frontends/qt2/lengthcombo.h b/src/frontends/qt3/lengthcombo.h
similarity index 100%
rename from src/frontends/qt2/lengthcombo.h
rename to src/frontends/qt3/lengthcombo.h
diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt3/lyx_gui.C
similarity index 99%
rename from src/frontends/qt2/lyx_gui.C
rename to src/frontends/qt3/lyx_gui.C
index 3e58be64e1..626eed8dad 100644
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt3/lyx_gui.C
@@ -1,5 +1,5 @@
 /**
- * \file qt2/lyx_gui.C
+ * \file qt3/lyx_gui.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt3/moc/Makefile.am
similarity index 70%
rename from src/frontends/qt2/moc/Makefile.am
rename to src/frontends/qt3/moc/Makefile.am
index f56114480b..a961f6744d 100644
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt3/moc/Makefile.am
@@ -13,15 +13,15 @@ AM_CPPFLAGS += \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/src/frontends/controllers \
-	-I$(top_builddir)/src/frontends/qt2 \
+	-I$(top_builddir)/src/frontends/qt3 \
 	$(QT_INCLUDES) \
 	$(BOOST_INCLUDES)
 
-noinst_LTLIBRARIES = libqt2moc.la
+noinst_LTLIBRARIES = libqt3moc.la
 
-nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
+nodist_libqt3moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
 # The trick.
-libqt2moc_la_LINK = touch libqt2moc.la ; echo
+libqt3moc_la_LINK = touch libqt3moc.la ; echo
 
 %_moc.C: $(srcdir)/../%.h
 	$(MOC) -o $@ $<
diff --git a/src/frontends/qt2/moc/pch.h b/src/frontends/qt3/moc/pch.h
similarity index 100%
rename from src/frontends/qt2/moc/pch.h
rename to src/frontends/qt3/moc/pch.h
diff --git a/src/frontends/qt2/panelstack.C b/src/frontends/qt3/panelstack.C
similarity index 100%
rename from src/frontends/qt2/panelstack.C
rename to src/frontends/qt3/panelstack.C
diff --git a/src/frontends/qt2/panelstack.h b/src/frontends/qt3/panelstack.h
similarity index 100%
rename from src/frontends/qt2/panelstack.h
rename to src/frontends/qt3/panelstack.h
diff --git a/src/frontends/qt2/pch.h b/src/frontends/qt3/pch.h
similarity index 100%
rename from src/frontends/qt2/pch.h
rename to src/frontends/qt3/pch.h
diff --git a/src/frontends/qt2/qcoloritem.C b/src/frontends/qt3/qcoloritem.C
similarity index 100%
rename from src/frontends/qt2/qcoloritem.C
rename to src/frontends/qt3/qcoloritem.C
diff --git a/src/frontends/qt2/qcoloritem.h b/src/frontends/qt3/qcoloritem.h
similarity index 100%
rename from src/frontends/qt2/qcoloritem.h
rename to src/frontends/qt3/qcoloritem.h
diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt3/qfont_loader.C
similarity index 100%
rename from src/frontends/qt2/qfont_loader.C
rename to src/frontends/qt3/qfont_loader.C
diff --git a/src/frontends/qt2/qfont_loader.h b/src/frontends/qt3/qfont_loader.h
similarity index 100%
rename from src/frontends/qt2/qfont_loader.h
rename to src/frontends/qt3/qfont_loader.h
diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt3/qfont_metrics.C
similarity index 100%
rename from src/frontends/qt2/qfont_metrics.C
rename to src/frontends/qt3/qfont_metrics.C
diff --git a/src/frontends/qt2/qfontexample.C b/src/frontends/qt3/qfontexample.C
similarity index 100%
rename from src/frontends/qt2/qfontexample.C
rename to src/frontends/qt3/qfontexample.C
diff --git a/src/frontends/qt2/qfontexample.h b/src/frontends/qt3/qfontexample.h
similarity index 100%
rename from src/frontends/qt2/qfontexample.h
rename to src/frontends/qt3/qfontexample.h
diff --git a/src/frontends/qt2/qlkey.h b/src/frontends/qt3/qlkey.h
similarity index 100%
rename from src/frontends/qt2/qlkey.h
rename to src/frontends/qt3/qlkey.h
diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt3/qscreen.C
similarity index 100%
rename from src/frontends/qt2/qscreen.C
rename to src/frontends/qt3/qscreen.C
diff --git a/src/frontends/qt2/qscreen.h b/src/frontends/qt3/qscreen.h
similarity index 100%
rename from src/frontends/qt2/qscreen.h
rename to src/frontends/qt3/qscreen.h
diff --git a/src/frontends/qt2/qsetborder.C b/src/frontends/qt3/qsetborder.C
similarity index 100%
rename from src/frontends/qt2/qsetborder.C
rename to src/frontends/qt3/qsetborder.C
diff --git a/src/frontends/qt2/qsetborder.h b/src/frontends/qt3/qsetborder.h
similarity index 100%
rename from src/frontends/qt2/qsetborder.h
rename to src/frontends/qt3/qsetborder.h
diff --git a/src/frontends/qt2/qtTimeout.C b/src/frontends/qt3/qtTimeout.C
similarity index 100%
rename from src/frontends/qt2/qtTimeout.C
rename to src/frontends/qt3/qtTimeout.C
diff --git a/src/frontends/qt2/qtTimeout.h b/src/frontends/qt3/qtTimeout.h
similarity index 100%
rename from src/frontends/qt2/qtTimeout.h
rename to src/frontends/qt3/qtTimeout.h
diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt3/qt_helpers.C
similarity index 100%
rename from src/frontends/qt2/qt_helpers.C
rename to src/frontends/qt3/qt_helpers.C
diff --git a/src/frontends/qt2/qt_helpers.h b/src/frontends/qt3/qt_helpers.h
similarity index 96%
rename from src/frontends/qt2/qt_helpers.h
rename to src/frontends/qt3/qt_helpers.h
index 3ce4976fb3..1f317a8cb5 100644
--- a/src/frontends/qt2/qt_helpers.h
+++ b/src/frontends/qt3/qt_helpers.h
@@ -58,7 +58,7 @@ QString const toqstr(std::string const & str);
 /**
  * qt_ - i18nize string and convert to unicode
  *
- * Use this in qt2/ instead of qt_()
+ * Use this in qt3/ instead of qt_()
  */
 QString const qt_(char const * str);
 
@@ -66,7 +66,7 @@ QString const qt_(char const * str);
 /**
  * qt_ - i18nize string and convert to unicode
  *
- * Use this in qt2/ instead of qt_()
+ * Use this in qt3/ instead of qt_()
  */
 QString const qt_(std::string const & str);
 
diff --git a/src/frontends/qt2/qttableview.C b/src/frontends/qt3/qttableview.C
similarity index 100%
rename from src/frontends/qt2/qttableview.C
rename to src/frontends/qt3/qttableview.C
diff --git a/src/frontends/qt2/qttableview.h b/src/frontends/qt3/qttableview.h
similarity index 100%
rename from src/frontends/qt2/qttableview.h
rename to src/frontends/qt3/qttableview.h
diff --git a/src/frontends/qt2/socket_callback.C b/src/frontends/qt3/socket_callback.C
similarity index 100%
rename from src/frontends/qt2/socket_callback.C
rename to src/frontends/qt3/socket_callback.C
diff --git a/src/frontends/qt2/socket_callback.h b/src/frontends/qt3/socket_callback.h
similarity index 100%
rename from src/frontends/qt2/socket_callback.h
rename to src/frontends/qt3/socket_callback.h
diff --git a/src/frontends/qt2/ui/BiblioModuleBase.ui b/src/frontends/qt3/ui/BiblioModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/BiblioModuleBase.ui
rename to src/frontends/qt3/ui/BiblioModuleBase.ui
diff --git a/src/frontends/qt2/ui/BranchesModuleBase.ui b/src/frontends/qt3/ui/BranchesModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/BranchesModuleBase.ui
rename to src/frontends/qt3/ui/BranchesModuleBase.ui
diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt3/ui/BulletsModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/BulletsModuleBase.ui
rename to src/frontends/qt3/ui/BulletsModuleBase.ui
diff --git a/src/frontends/qt2/ui/LaTeXModuleBase.ui b/src/frontends/qt3/ui/LaTeXModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/LaTeXModuleBase.ui
rename to src/frontends/qt3/ui/LaTeXModuleBase.ui
diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt3/ui/LanguageModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/LanguageModuleBase.ui
rename to src/frontends/qt3/ui/LanguageModuleBase.ui
diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt3/ui/Makefile.am
similarity index 78%
rename from src/frontends/qt2/ui/Makefile.am
rename to src/frontends/qt3/ui/Makefile.am
index 9c8a4e65b4..e9f66bb559 100644
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt3/ui/Makefile.am
@@ -14,15 +14,15 @@ AM_CPPFLAGS += \
 	$(PCH_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/frontends \
-	-I$(top_srcdir)/src/frontends/qt2 \
+	-I$(top_srcdir)/src/frontends/qt3 \
 	$(QT_INCLUDES) $(BOOST_INCLUDES) \
 	-I$(top_srcdir)/src/frontends/controllers
 
-noinst_LTLIBRARIES = libqt2ui.la
+noinst_LTLIBRARIES = libqt3ui.la
 
-nodist_libqt2ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)
+nodist_libqt3ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)
 # The trick.
-libqt2ui_la_LINK = touch libqt2ui.la ; echo
+libqt3ui_la_LINK = touch libqt3ui.la ; echo
 
 # Use _() for localization instead of tr() or trUtf8()
 UICFLAGS=-tr qt_
diff --git a/src/frontends/qt2/ui/MarginsModuleBase.ui b/src/frontends/qt3/ui/MarginsModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/MarginsModuleBase.ui
rename to src/frontends/qt3/ui/MarginsModuleBase.ui
diff --git a/src/frontends/qt2/ui/MathsModuleBase.ui b/src/frontends/qt3/ui/MathsModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/MathsModuleBase.ui
rename to src/frontends/qt3/ui/MathsModuleBase.ui
diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt3/ui/NumberingModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/NumberingModuleBase.ui
rename to src/frontends/qt3/ui/NumberingModuleBase.ui
diff --git a/src/frontends/qt2/ui/PageLayoutModuleBase.ui b/src/frontends/qt3/ui/PageLayoutModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/PageLayoutModuleBase.ui
rename to src/frontends/qt3/ui/PageLayoutModuleBase.ui
diff --git a/src/frontends/qt2/ui/PreambleModuleBase.ui b/src/frontends/qt3/ui/PreambleModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/PreambleModuleBase.ui
rename to src/frontends/qt3/ui/PreambleModuleBase.ui
diff --git a/src/frontends/qt2/ui/QAboutDialogBase.ui b/src/frontends/qt3/ui/QAboutDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QAboutDialogBase.ui
rename to src/frontends/qt3/ui/QAboutDialogBase.ui
diff --git a/src/frontends/qt2/ui/QAskForTextDialog.ui b/src/frontends/qt3/ui/QAskForTextDialog.ui
similarity index 100%
rename from src/frontends/qt2/ui/QAskForTextDialog.ui
rename to src/frontends/qt3/ui/QAskForTextDialog.ui
diff --git a/src/frontends/qt2/ui/QBibitemDialogBase.ui b/src/frontends/qt3/ui/QBibitemDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBibitemDialogBase.ui
rename to src/frontends/qt3/ui/QBibitemDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBibtexAddDialogBase.ui b/src/frontends/qt3/ui/QBibtexAddDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBibtexAddDialogBase.ui
rename to src/frontends/qt3/ui/QBibtexAddDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt3/ui/QBibtexDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBibtexDialogBase.ui
rename to src/frontends/qt3/ui/QBibtexDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBoxDialogBase.ui b/src/frontends/qt3/ui/QBoxDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBoxDialogBase.ui
rename to src/frontends/qt3/ui/QBoxDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBranchDialogBase.ui b/src/frontends/qt3/ui/QBranchDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBranchDialogBase.ui
rename to src/frontends/qt3/ui/QBranchDialogBase.ui
diff --git a/src/frontends/qt2/ui/QChangesDialogBase.ui b/src/frontends/qt3/ui/QChangesDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QChangesDialogBase.ui
rename to src/frontends/qt3/ui/QChangesDialogBase.ui
diff --git a/src/frontends/qt2/ui/QCharacterDialogBase.ui b/src/frontends/qt3/ui/QCharacterDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QCharacterDialogBase.ui
rename to src/frontends/qt3/ui/QCharacterDialogBase.ui
diff --git a/src/frontends/qt2/ui/QCitationDialogBase.ui b/src/frontends/qt3/ui/QCitationDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QCitationDialogBase.ui
rename to src/frontends/qt3/ui/QCitationDialogBase.ui
diff --git a/src/frontends/qt2/ui/QCitationFindDialogBase.ui b/src/frontends/qt3/ui/QCitationFindDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QCitationFindDialogBase.ui
rename to src/frontends/qt3/ui/QCitationFindDialogBase.ui
diff --git a/src/frontends/qt2/ui/QDelimiterDialogBase.ui b/src/frontends/qt3/ui/QDelimiterDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QDelimiterDialogBase.ui
rename to src/frontends/qt3/ui/QDelimiterDialogBase.ui
diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt3/ui/QDocumentDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QDocumentDialogBase.ui
rename to src/frontends/qt3/ui/QDocumentDialogBase.ui
diff --git a/src/frontends/qt2/ui/QERTDialogBase.ui b/src/frontends/qt3/ui/QERTDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QERTDialogBase.ui
rename to src/frontends/qt3/ui/QERTDialogBase.ui
diff --git a/src/frontends/qt2/ui/QErrorListDialogBase.ui b/src/frontends/qt3/ui/QErrorListDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QErrorListDialogBase.ui
rename to src/frontends/qt3/ui/QErrorListDialogBase.ui
diff --git a/src/frontends/qt2/ui/QExternalDialogBase.ui b/src/frontends/qt3/ui/QExternalDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QExternalDialogBase.ui
rename to src/frontends/qt3/ui/QExternalDialogBase.ui
diff --git a/src/frontends/qt2/ui/QFloatDialogBase.ui b/src/frontends/qt3/ui/QFloatDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QFloatDialogBase.ui
rename to src/frontends/qt3/ui/QFloatDialogBase.ui
diff --git a/src/frontends/qt2/ui/QGraphicsDialogBase.ui b/src/frontends/qt3/ui/QGraphicsDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QGraphicsDialogBase.ui
rename to src/frontends/qt3/ui/QGraphicsDialogBase.ui
diff --git a/src/frontends/qt2/ui/QIncludeDialogBase.ui b/src/frontends/qt3/ui/QIncludeDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QIncludeDialogBase.ui
rename to src/frontends/qt3/ui/QIncludeDialogBase.ui
diff --git a/src/frontends/qt2/ui/QIndexDialogBase.ui b/src/frontends/qt3/ui/QIndexDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QIndexDialogBase.ui
rename to src/frontends/qt3/ui/QIndexDialogBase.ui
diff --git a/src/frontends/qt2/ui/QLogDialogBase.ui b/src/frontends/qt3/ui/QLogDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QLogDialogBase.ui
rename to src/frontends/qt3/ui/QLogDialogBase.ui
diff --git a/src/frontends/qt2/ui/QMathDialogBase.ui b/src/frontends/qt3/ui/QMathDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QMathDialogBase.ui
rename to src/frontends/qt3/ui/QMathDialogBase.ui
diff --git a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui b/src/frontends/qt3/ui/QMathMatrixDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QMathMatrixDialogBase.ui
rename to src/frontends/qt3/ui/QMathMatrixDialogBase.ui
diff --git a/src/frontends/qt2/ui/QNoteDialogBase.ui b/src/frontends/qt3/ui/QNoteDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QNoteDialogBase.ui
rename to src/frontends/qt3/ui/QNoteDialogBase.ui
diff --git a/src/frontends/qt2/ui/QParagraphDialogBase.ui b/src/frontends/qt3/ui/QParagraphDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QParagraphDialogBase.ui
rename to src/frontends/qt3/ui/QParagraphDialogBase.ui
diff --git a/src/frontends/qt2/ui/QPrefAsciiModule.ui b/src/frontends/qt3/ui/QPrefAsciiModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefAsciiModule.ui
rename to src/frontends/qt3/ui/QPrefAsciiModule.ui
diff --git a/src/frontends/qt2/ui/QPrefColorsModule.ui b/src/frontends/qt3/ui/QPrefColorsModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefColorsModule.ui
rename to src/frontends/qt3/ui/QPrefColorsModule.ui
diff --git a/src/frontends/qt2/ui/QPrefConvertersModule.ui b/src/frontends/qt3/ui/QPrefConvertersModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefConvertersModule.ui
rename to src/frontends/qt3/ui/QPrefConvertersModule.ui
diff --git a/src/frontends/qt2/ui/QPrefCopiersModule.ui b/src/frontends/qt3/ui/QPrefCopiersModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefCopiersModule.ui
rename to src/frontends/qt3/ui/QPrefCopiersModule.ui
diff --git a/src/frontends/qt2/ui/QPrefCygwinPathModule.ui b/src/frontends/qt3/ui/QPrefCygwinPathModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefCygwinPathModule.ui
rename to src/frontends/qt3/ui/QPrefCygwinPathModule.ui
diff --git a/src/frontends/qt2/ui/QPrefDateModule.ui b/src/frontends/qt3/ui/QPrefDateModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefDateModule.ui
rename to src/frontends/qt3/ui/QPrefDateModule.ui
diff --git a/src/frontends/qt2/ui/QPrefDisplayModule.ui b/src/frontends/qt3/ui/QPrefDisplayModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefDisplayModule.ui
rename to src/frontends/qt3/ui/QPrefDisplayModule.ui
diff --git a/src/frontends/qt2/ui/QPrefFileformatsModule.ui b/src/frontends/qt3/ui/QPrefFileformatsModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefFileformatsModule.ui
rename to src/frontends/qt3/ui/QPrefFileformatsModule.ui
diff --git a/src/frontends/qt2/ui/QPrefIdentityModule.ui b/src/frontends/qt3/ui/QPrefIdentityModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefIdentityModule.ui
rename to src/frontends/qt3/ui/QPrefIdentityModule.ui
diff --git a/src/frontends/qt2/ui/QPrefKeyboardModule.ui b/src/frontends/qt3/ui/QPrefKeyboardModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefKeyboardModule.ui
rename to src/frontends/qt3/ui/QPrefKeyboardModule.ui
diff --git a/src/frontends/qt2/ui/QPrefLanguageModule.ui b/src/frontends/qt3/ui/QPrefLanguageModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefLanguageModule.ui
rename to src/frontends/qt3/ui/QPrefLanguageModule.ui
diff --git a/src/frontends/qt2/ui/QPrefLatexModule.ui b/src/frontends/qt3/ui/QPrefLatexModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefLatexModule.ui
rename to src/frontends/qt3/ui/QPrefLatexModule.ui
diff --git a/src/frontends/qt2/ui/QPrefPathsModule.ui b/src/frontends/qt3/ui/QPrefPathsModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefPathsModule.ui
rename to src/frontends/qt3/ui/QPrefPathsModule.ui
diff --git a/src/frontends/qt2/ui/QPrefPrinterModule.ui b/src/frontends/qt3/ui/QPrefPrinterModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefPrinterModule.ui
rename to src/frontends/qt3/ui/QPrefPrinterModule.ui
diff --git a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui b/src/frontends/qt3/ui/QPrefScreenFontsModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefScreenFontsModule.ui
rename to src/frontends/qt3/ui/QPrefScreenFontsModule.ui
diff --git a/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui b/src/frontends/qt3/ui/QPrefSpellcheckerModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefSpellcheckerModule.ui
rename to src/frontends/qt3/ui/QPrefSpellcheckerModule.ui
diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt3/ui/QPrefUIModule.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefUIModule.ui
rename to src/frontends/qt3/ui/QPrefUIModule.ui
diff --git a/src/frontends/qt2/ui/QPrefsDialogBase.ui b/src/frontends/qt3/ui/QPrefsDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefsDialogBase.ui
rename to src/frontends/qt3/ui/QPrefsDialogBase.ui
diff --git a/src/frontends/qt2/ui/QPrintDialogBase.ui b/src/frontends/qt3/ui/QPrintDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrintDialogBase.ui
rename to src/frontends/qt3/ui/QPrintDialogBase.ui
diff --git a/src/frontends/qt2/ui/QRefDialogBase.ui b/src/frontends/qt3/ui/QRefDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QRefDialogBase.ui
rename to src/frontends/qt3/ui/QRefDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSearchDialogBase.ui b/src/frontends/qt3/ui/QSearchDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSearchDialogBase.ui
rename to src/frontends/qt3/ui/QSearchDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSendtoDialogBase.ui b/src/frontends/qt3/ui/QSendtoDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSendtoDialogBase.ui
rename to src/frontends/qt3/ui/QSendtoDialogBase.ui
diff --git a/src/frontends/qt2/ui/QShowFileDialogBase.ui b/src/frontends/qt3/ui/QShowFileDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QShowFileDialogBase.ui
rename to src/frontends/qt3/ui/QShowFileDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSpellcheckerDialogBase.ui b/src/frontends/qt3/ui/QSpellcheckerDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSpellcheckerDialogBase.ui
rename to src/frontends/qt3/ui/QSpellcheckerDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTabularCreateDialogBase.ui b/src/frontends/qt3/ui/QTabularCreateDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTabularCreateDialogBase.ui
rename to src/frontends/qt3/ui/QTabularCreateDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTabularDialogBase.ui b/src/frontends/qt3/ui/QTabularDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTabularDialogBase.ui
rename to src/frontends/qt3/ui/QTabularDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTexinfoDialogBase.ui b/src/frontends/qt3/ui/QTexinfoDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTexinfoDialogBase.ui
rename to src/frontends/qt3/ui/QTexinfoDialogBase.ui
diff --git a/src/frontends/qt2/ui/QThesaurusDialogBase.ui b/src/frontends/qt3/ui/QThesaurusDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QThesaurusDialogBase.ui
rename to src/frontends/qt3/ui/QThesaurusDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTocDialogBase.ui b/src/frontends/qt3/ui/QTocDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTocDialogBase.ui
rename to src/frontends/qt3/ui/QTocDialogBase.ui
diff --git a/src/frontends/qt2/ui/QURLDialogBase.ui b/src/frontends/qt3/ui/QURLDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QURLDialogBase.ui
rename to src/frontends/qt3/ui/QURLDialogBase.ui
diff --git a/src/frontends/qt2/ui/QVSpaceDialogBase.ui b/src/frontends/qt3/ui/QVSpaceDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QVSpaceDialogBase.ui
rename to src/frontends/qt3/ui/QVSpaceDialogBase.ui
diff --git a/src/frontends/qt2/ui/QViewSourceDialogBase.ui b/src/frontends/qt3/ui/QViewSourceDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QViewSourceDialogBase.ui
rename to src/frontends/qt3/ui/QViewSourceDialogBase.ui
diff --git a/src/frontends/qt2/ui/QWrapDialogBase.ui b/src/frontends/qt3/ui/QWrapDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QWrapDialogBase.ui
rename to src/frontends/qt3/ui/QWrapDialogBase.ui
diff --git a/src/frontends/qt2/ui/TextLayoutModuleBase.ui b/src/frontends/qt3/ui/TextLayoutModuleBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/TextLayoutModuleBase.ui
rename to src/frontends/qt3/ui/TextLayoutModuleBase.ui
diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt3/ui/moc/Makefile.am
similarity index 75%
rename from src/frontends/qt2/ui/moc/Makefile.am
rename to src/frontends/qt3/ui/moc/Makefile.am
index 26cdecb2c1..324c7be244 100644
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt3/ui/moc/Makefile.am
@@ -16,11 +16,11 @@ AM_CPPFLAGS += \
 	$(QT_INCLUDES) \
 	$(BOOST_INCLUDES)
 
-noinst_LTLIBRARIES = libqt2uimoc.la
+noinst_LTLIBRARIES = libqt3uimoc.la
 
-nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
+nodist_libqt3uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
 # The trick.
-libqt2uimoc_la_LINK = touch libqt2uimoc.la ; echo
+libqt3uimoc_la_LINK = touch libqt3uimoc.la ; echo
 
 %_moc.C: ../%.h
 	$(MOC) -o $@ $<
diff --git a/src/frontends/qt2/ui/moc/pch.h b/src/frontends/qt3/ui/moc/pch.h
similarity index 100%
rename from src/frontends/qt2/ui/moc/pch.h
rename to src/frontends/qt3/ui/moc/pch.h
diff --git a/src/frontends/qt2/ui/pch.h b/src/frontends/qt3/ui/pch.h
similarity index 100%
rename from src/frontends/qt2/ui/pch.h
rename to src/frontends/qt3/ui/pch.h
diff --git a/src/frontends/qt2/validators.C b/src/frontends/qt3/validators.C
similarity index 100%
rename from src/frontends/qt2/validators.C
rename to src/frontends/qt3/validators.C
diff --git a/src/frontends/qt2/validators.h b/src/frontends/qt3/validators.h
similarity index 100%
rename from src/frontends/qt2/validators.h
rename to src/frontends/qt3/validators.h