Clean configuration files

RedisInsight · Apr 16, 2015 · 0779822 · 0779822
1 parent b4b9d14
commit 0779822
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,6 @@ script:
   - ./../bin/tests/tests -platform minimal -txt
   - ./../bin/tests/qml_tests -platform minimal -txt
   - cd ./../src
-  - python ./../build/set_version.py 1.0.0 > version.h
   - sudo chmod a+x configure
   - ./configure
   - qmake

diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri
@@ -20,7 +20,6 @@ INCLUDEPATH += $$BREAKPADDIR/src
 DEPENDPATH += $$PWD/libssh2/include
 DEPENDPATH += $$BREAKPADDIR
 
-#win32-msvc* {
 win32* {
     CONFIG(release, debug|release) {
         WIN_DEPS_PATH = $$PWD/libs/win32/release/
@@ -81,6 +80,9 @@ unix:!macx { # ubuntu & debian
 
     QMAKE_CXXFLAGS += -std=gnu++0x -g #workaround for google breakpad
 
+    # clean default flags
+    QMAKE_LFLAGS_RPATH=
+
     LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib #don't remove!!!
     LIBS += /usr/local/lib/libssh2.a
     LIBS += -lcrypto -lz

diff --git a/src/rdm.pro b/src/rdm.pro
@@ -12,6 +12,7 @@ TEMPLATE = app
 # Skip version file
 !exists( $$PWD/version.h ) {    
     DEFINES += RDM_VERSION=\\\"0.8.0.0\\\"
+    message("Version: 0.8.0.0")
 }
 
 DEFINES += ELPP_QT_LOGGING ELPP_STL_LOGGING
@@ -33,7 +34,6 @@ SOURCES += \
     $$PWD/modules/updater/*.cpp \
 
 HEADERS  += \
-    $$PWD/version.h \
     $$PWD/app/dialogs/*.h \
     $$PWD/app/models/*.h \
     $$PWD/app/models/key-models/*.h \
@@ -95,7 +95,6 @@ unix:!macx { # ubuntu & debian
     CONFIG += static release
     CONFIG -= debug
 
-    #Qt static linked on Ubuntu/Debian
     QMAKE_LFLAGS += -static-libgcc -static-libstdc++
 
     release: DESTDIR = ./../bin/linux/release