diff --git a/development/cmake/build-debug.bat b/development/cmake/build-debug.bat
index bf345ada47..e3bacdc5fa 100755
--- a/development/cmake/build-debug.bat
+++ b/development/cmake/build-debug.bat
@@ -4,10 +4,11 @@
 cmake ..\trunk\development\cmake -Dmerge=1
 
 :: clean
-devenv lyx-qt4.sln /clean Debug
+devenv lyx.sln /clean Debug
 
 :: rebuild all generated files
 cmake ..\trunk\development\cmake -Dmerge_rebuild=1
 
 :: build release version
-devenv lyx-qt4.sln /build Debug
\ No newline at end of file
+devenv lyx.sln /build Debug
+
diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index bb0a6511a4..a5597db2ff 100755
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -2,10 +2,11 @@
 cmake ..\trunk\development\cmake -Dmerge=1
 
 :: clean
-devenv lyx-qt4.sln /clean Release
+devenv lyx.sln /clean Release
 
 :: rebuild all generated files
 cmake ..\trunk\development\cmake -Dmerge_rebuild=1
 
 :: build release version
-devenv lyx-qt4.sln /build Release
\ No newline at end of file
+devenv lyx.sln /build Release
+
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index cef8055cae..b9dc1e76ab 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -28,15 +28,6 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR})
 
 if(MERGE_FILES)
-	list(REMOVE_ITEM frontends_qt4_sources
-		${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
-	list(APPEND frontends_qt4_sources
-		${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
-	list(REVERSE frontends_qt4_sources)
-	list(REMOVE_ITEM frontends_qt4_sources
-		${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
-	list(APPEND frontends_qt4_sources
-		${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
 	lyx_const_touched_files(_allinone frontends_qt4_sources)
 	set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
 	set_source_files_properties(_allinone_const.C