diff options
| author | Alex <b0ris@b0ris-satellite.localdomain> | 2011-11-05 19:03:04 +0200 |
|---|---|---|
| committer | Alex <b0ris@b0ris-satellite.localdomain> | 2011-11-05 19:03:04 +0200 |
| commit | c34e933ae10ac5ffd7c0e06cf5fa62aa95eb536a (patch) | |
| tree | 8b93a20f8d5bafb4672a788c64ed5352e848f252 /client/client.pro | |
| parent | f1889d6c4b2c658177bfce08f41b6e1c337aec5e (diff) | |
| parent | 544c4714a4e1f6b5bedf7b58d07080c5a6dee860 (diff) | |
Fix conflicting Config.cpp
Diffstat (limited to 'client/client.pro')
| -rwxr-xr-x[-rw-r--r--] | client/client.pro | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/client/client.pro b/client/client.pro index c722957..2a05e1a 100644..100755 --- a/client/client.pro +++ b/client/client.pro @@ -1,24 +1,36 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Oct 19 03:05:59 2011 -###################################################################### - -QMAKE_CXXFLAGS=-O0 -QMAKE_CXXFLAGS_DEBUG += -DDEBUG -g3 -ggdb -O0 - -CONFIG -= release -CONFIG += debug console - -QT += network - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += client.h Proxy.h Dialog.h ProxyClientApp.h Logger.h Config.h SslClient.h -SOURCES += Dialog.cpp main.cpp Proxy.cpp ProxyClientApp.cpp Logger.cpp Config.cpp SslClient.cpp - -OTHER_FILES += - -RESOURCES += client.qrc +######################################################################
+# Automatically generated by qmake (2.01a) Wed Oct 19 03:05:59 2011
+######################################################################
+
+QMAKE_CXXFLAGS=-O0
+QMAKE_CXXFLAGS_DEBUG += -DDEBUG -g3 -ggdb -O0
+
+CONFIG -= release
+CONFIG += debug console
+
+QT += network
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += client.h Proxy.h Dialog.h ProxyClientApp.h Logger.h Config.h SslClient.h \
+ ../libs/qtsingleapplication/src/qtsingleapplication.h \
+ ../libs/qtsingleapplication/src/qtlockedfile.h \
+ ../libs/qtsingleapplication/src/qtlocalpeer.h \
+ ../libs/qtsingleapplication/src/qtsinglecoreapplication.h
+SOURCES += Dialog.cpp main.cpp Proxy.cpp ProxyClientApp.cpp Logger.cpp Config.cpp SslClient.cpp \
+ ../libs/qtsingleapplication/src/qtsinglecoreapplication.cpp \
+ ../libs/qtsingleapplication/src/qtsingleapplication.cpp \
+ ../libs/qtsingleapplication/src/qtlockedfile_win.cpp \
+ ../libs/qtsingleapplication/src/qtlockedfile_unix.cpp \
+ ../libs/qtsingleapplication/src/qtlockedfile.cpp \
+ ../libs/qtsingleapplication/src/qtlocalpeer.cpp
+
+OTHER_FILES +=
+
+RESOURCES += client.qrc
+
+
|