Build after merge

src/CMakeLists.txt

@@ -1,6 +1,4 @@
 # TODO: OSX and LIB_ONLY seem to require this to go to binary dir only
-    mirall/discoveryphase.cpp
-    mirall/selectivesyncdialog.cpp
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)

src/gui/CMakeLists.txt

@@ -47,6 +47,7 @@ set(mirall_SRCS
     owncloudgui.cpp
     owncloudsetupwizard.cpp
     protocolwidget.cpp
+    selectivesyncdialog.cpp
     settingsdialog.cpp
     socketapi.cpp
     sslbutton.cpp

src/libsync/CMakeLists.txt

@@ -32,30 +32,31 @@ if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY)
 endif()
 
 set(libsync_SRCS
-    authenticationdialog.cpp
-    mirallconfigfile.cpp
-    syncengine.cpp
-    owncloudpropagator.cpp
-    propagatorjobs.cpp
-    propagator_qnam.cpp
-    propagator_legacy.cpp
-    syncjournalfilerecord.cpp
-    syncjournaldb.cpp
-    theme.cpp
-    logger.cpp
-    utility.cpp
-    filesystem.cpp
-    connectionvalidator.cpp
-    progressdispatcher.cpp
-    mirallaccessmanager.cpp
-    networkjobs.cpp
     account.cpp
-    quotainfo.cpp
+    authenticationdialog.cpp
     clientproxy.cpp
+    connectionvalidator.cpp
     cookiejar.cpp
-    syncfilestatus.cpp
-    syncresult.cpp
+    discoveryphase.cpp
+    filesystem.cpp
+    logger.cpp
+    mirallaccessmanager.cpp
+    mirallconfigfile.cpp
+    networkjobs.cpp
+    owncloudpropagator.cpp
     owncloudtheme.cpp
+    progressdispatcher.cpp
+    propagatorjobs.cpp
+    propagator_legacy.cpp
+    propagator_qnam.cpp
+    quotainfo.cpp
+    syncengine.cpp
+    syncfilestatus.cpp
+    syncjournaldb.cpp
+    syncjournalfilerecord.cpp
+    syncresult.cpp
+    theme.cpp
+    utility.cpp
     creds/dummycredentials.cpp
     creds/abstractcredentials.cpp
     creds/credentialsfactory.cpp