let's see if we can do this on Qt4

2 files changed, 2 insertions, 18 deletions

diff --git a/.travis.yml b/.travis.yml
index 8f64e5ae..63811d47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,27 +9,13 @@ compiler:
   - clang
 
 before_install:
-  - if [ "$CXX" = "g++" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
-  - if [ "$CXX" = "g++" ]; then sudo apt-get update -qq; fi
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50; fi
-  - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50; fi
   - QtMkspec=$CC
   - $CC --version
-  - which $CC
-  # workaround clang not system wide, fail on sudo make install
-  - export CC=`which $CC`
-  - wget -O Qt5.2.0.tar.xz https://dl.dropboxusercontent.com/u/20447449/Qt5.2.0.tar.xz
-  - mkdir ~/Qt5.2.0
-  - tar -xJf Qt5.2.0.tar.xz -C ~/Qt5.2.0
-  - sudo chmod -R 777 ~/Qt5.2.0/
-  - ln -s ~/Qt5.2.0/5.2.0/gcc_64/mkspecs/linux-g++ ~/Qt5.2.0/5.2.0/gcc_64/mkspecs/linux-gcc
-  - cd ..
 
 script:
   - cd qtpass
-  - ~/Qt5.2.0/5.2.0/gcc_64/bin/qmake -v
-  - ~/Qt5.2.0/5.2.0/gcc_64/bin/qmake -spec linux-$QtMkspec -Wall qtpass.pro
+  - qmake -v
+  - qmake -spec linux-$QtMkspec -Wall qtpass.pro
   - make -j$(nproc)
 
 notifications:
diff --git a/README.md b/README.md
index 4b7510aa..91541678 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,6 @@ Features
 * Per-folder user selection for multi recipient encryption
 * Multiple profiles
 
-While QtPass will work with Qt4, currently multi-line editing is restricted to Qt5 only.
-
 Logo based on https://commons.wikimedia.org/wiki/File:Heart-padlock.svg by AnonMoos.
 
 Security considerations