Switch to unified view

a/upplay.pro b/upplay.pro
...
...
5
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets
5
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets
6
6
7
#QT += script widgets network webenginewidgets
7
#QT += script widgets network webenginewidgets
8
8
9
# VERSION is ^egrepped and must stay in the first column
9
# VERSION is ^egrepped and must stay in the first column
10
VERSION = 1.0.0
10
VERSION = 1.1.0
11
11
12
QMAKE_CXXFLAGS += -DUPPLAY_VERSION=\\\"$$VERSION\\\" 
12
QMAKE_CXXFLAGS += -DUPPLAY_VERSION=\\\"$$VERSION\\\" 
13
QMAKE_CXXFLAGS += -std=c++0x
13
QMAKE_CXXFLAGS += -std=c++0x
14
#QMAKE_CXXFLAGS += -DUSING_WEBENGINE
14
#QMAKE_CXXFLAGS += -DUSING_WEBENGINE
15
15
16
buildtype = release
16
CONFIG  += qt warn_on thread debug
17
CONFIG  += qt warn_on thread $$buildtype
17
18
18
RESOURCES += GUI/upplay.qrc
19
RESOURCES += GUI/upplay.qrc
19
20
20
HEADERS += \
21
HEADERS += \
21
        GUI/ContextMenu.h \
22
        GUI/ContextMenu.h \
...
...
137
  DEFINES -= _UNICODE
138
  DEFINES -= _UNICODE
138
  DEFINES += _MBCS
139
  DEFINES += _MBCS
139
  DEFINES += PSAPI_VERSION=1
140
  DEFINES += PSAPI_VERSION=1
140
  INCLUDEPATH += c:/users/bill/documents/upnp/libupnpp
141
  INCLUDEPATH += c:/users/bill/documents/upnp/libupnpp
141
  INCLUDEPATH += c:/users/bill/documents/upnp/pupnp/include
142
  INCLUDEPATH += c:/users/bill/documents/upnp/pupnp/include
142
  LIBS += -Lc:/Users/Bill/Documents/UPnP/libupnpp/windows/build-libupnpp-Desktop_Qt_5_5_0_MinGW_32bit-Debug/debug -lupnpp
143
  LIBS += -L../libupnpp/windows/build-libupnpp-Desktop_Qt_5_5_0_MinGW_32bit-$$buildtype/$$buildtype -lupnpp
143
  LIBS += c:/users/bill/documents/upnp/expat-2.1.0/.libs/libexpat.a
144
  LIBS += c:/users/bill/documents/upnp/expat-2.1.0/.libs/libexpat.a
144
  LIBS += c:/users/bill/documents/upnp/curl-7.43.0/lib/libcurl.a
145
  LIBS += c:/users/bill/documents/upnp/curl-7.43.0/lib/libcurl.a
145
  LIBS += c:/users/bill/documents/upnp/pupnp/upnp/.libs/libupnp.a
146
  LIBS += c:/users/bill/documents/upnp/pupnp/upnp/.libs/libupnp.a
146
  LIBS += c:/users/bill/documents/upnp/pupnp/ixml/.libs/libixml.a
147
  LIBS += c:/users/bill/documents/upnp/pupnp/ixml/.libs/libixml.a
147
  LIBS += c:/users/bill/documents/upnp/pupnp/threadutil/.libs/libthreadutil.a
148
  LIBS += c:/users/bill/documents/upnp/pupnp/threadutil/.libs/libthreadutil.a