Revert "moved gui into main subfolder #4168"

This reverts commit 39f98d8133.
This commit is contained in:
XinyuHou 2015-02-05 11:44:23 +00:00
parent 26fb6b77db
commit fc04901cda
197 changed files with 11 additions and 11 deletions

View File

@ -95,7 +95,7 @@ HEADERS += src/MainWindow.h \
src/LoginResult.h
RESOURCES += res/Synergy.qrc
RC_FILE = res/win/Synergy.rc
macx {
macx {
HEADERS += src/AXDatabaseCleaner.h
OBJECTIVE_SOURCES += src/AXDatabaseCleaner.mm
QMAKE_INFO_PLIST = res/mac/Info.plist
@ -106,21 +106,21 @@ macx {
LIBS += $$MACX_LIBS
}
unix:!macx:LIBS += -ldns_sd
win32 {
Debug:DESTDIR = ../../../bin/Debug
Release:DESTDIR = ../../../bin/Release
LIBS += -L"../../../ext/bonjour/x64" \
-ldnssd
INCLUDEPATH += "$(BONJOUR_SDK_HOME)/Include"
}
else:DESTDIR = ../../../bin
debug {
debug {
OBJECTS_DIR = tmp/debug
MOC_DIR = tmp/debug
RCC_DIR = tmp/debug
}
release {
release {
OBJECTS_DIR = tmp/release
MOC_DIR = tmp/release
RCC_DIR = tmp/release
}
win32 {
Debug:DESTDIR = ../../bin/Debug
Release:DESTDIR = ../../bin/Release
LIBS += -L"../../ext/bonjour/x64" \
-ldnssd
INCLUDEPATH += "$(BONJOUR_SDK_HOME)/Include"
}
else:DESTDIR = ../../bin

View File

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 738 B

View File

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 651 B

View File

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 442 B

View File

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 693 B

View File

Before

Width:  |  Height:  |  Size: 281 KiB

After

Width:  |  Height:  |  Size: 281 KiB

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Some files were not shown because too many files have changed in this diff Show More