[GNUnet-SVN] r36658 - gnunet-qt/secushare

[gnunet]

Author: tg
Date: 2015-11-12 19:30:45 +0100 (Thu, 12 Nov 2015)
New Revision: 36658

Modified:
   gnunet-qt/secushare/README.txt
   gnunet-qt/secushare/deployment.pri
   gnunet-qt/secushare/secushare.pro
Log:
qmake options & instructions

Modified: gnunet-qt/secushare/README.txt
===================================================================
--- gnunet-qt/secushare/README.txt      2015-11-12 18:30:43 UTC (rev 36657)
+++ gnunet-qt/secushare/README.txt      2015-11-12 18:30:45 UTC (rev 36658)
@@ -1,9 +1,14 @@
 This project needs the following libraries:
+- Qt >= 5.3
+- libqrencode
+- qzxing from https://github.com/bratao/qzxing
 
-    - Qt >= 5.3
-    - libqrencode
-    - qzxing from https://github.com/bratao/qzxing
+If 'qmake' says 'unknown QT: qml' you are using the qt4 qmake or you're 
missing the package containing qml.
+Gentoo has the correct qmake in /usr/lib/qt5/bin/qmake.
 
-If 'qmake' says 'unknown QT: qml' you are
-using the qt4 qmake. Gentoo has the correct
-qmake in /usr/lib/qt5/bin/qmake.
+Installation:
+
+qmake && make && make install
+
+Some useful options for qmake if you need to use different paths than the 
default:
+qmake 'INCLUDEPATH += /opt/gnunet/include' 'LIBS += -L/opt/gnunet/lib' 'PREFIX 
= /opt/gnunet'

Modified: gnunet-qt/secushare/deployment.pri
===================================================================
--- gnunet-qt/secushare/deployment.pri  2015-11-12 18:30:43 UTC (rev 36657)
+++ gnunet-qt/secushare/deployment.pri  2015-11-12 18:30:45 UTC (rev 36658)
@@ -1,27 +1,33 @@
-android-no-sdk {
+! isEmpty (PREFIX) {
+  target.path = $$PREFIX/bin
+  export(target.path)
+  INSTALLS += target
+} else {
+
+  android-no-sdk {
     target.path = /data/user/qt
     export(target.path)
     INSTALLS += target
-} else:android {
+  } else:android {
     x86 {
-        target.path = /libs/x86
+      target.path = /libs/x86
     } else: armeabi-v7a {
-        target.path = /libs/armeabi-v7a
+      target.path = /libs/armeabi-v7a
     } else {
-        target.path = /libs/armeabi
+      target.path = /libs/armeabi
     }
     export(target.path)
     INSTALLS += target
-} else:unix {
+  } else:unix {
     isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /usr/local/bin
-        }
-        export(target.path)
+      qnx {
+        target.path = /tmp/$${TARGET}/bin
+      } else {
+        target.path = /usr/local/bin
+      }
+      export(target.path)
     }
     INSTALLS += target
+  }
 }
-
 export(INSTALLS)

Modified: gnunet-qt/secushare/secushare.pro
===================================================================
--- gnunet-qt/secushare/secushare.pro   2015-11-12 18:30:43 UTC (rev 36657)
+++ gnunet-qt/secushare/secushare.pro   2015-11-12 18:30:45 UTC (rev 36658)
@@ -2,10 +2,8 @@
 
 QT += qml quick widgets
 
-INCLUDEPATH += /usr/depot/include
+LIBS += -lgnunetutil -lgnunetcore -lgnunetidentity -lgnunetarm -lgnunetsocial 
-lgnunetenv -lgnunetpsycutil -lgnunetfriends -lextractor -lqrencode
 
-LIBS += -lgnunetutil -lgnunetcore -lgnunetidentity -lgnunetarm -lgnunetsocial 
-lgnunetenv -lgnunetpsycutil -lgnunetfriends -lextractor -lqrencode 
-L/usr/depot/lib
-
 #include(3rdParty/qzxing-master/QZXing.pro)
 
 SOURCES += main.cpp \
@@ -25,7 +23,7 @@
 
 RESOURCES += qml.qrc
 
-# Additional import path used to resolve QML modules in Qt Creator's code model
+# Additional import path used to resolve QML modules in the code model of Qt 
Creator
 QML_IMPORT_PATH =
 
 # Default rules for deployment.
@@ -47,4 +45,5 @@
     core/social/socialservice.h \
     core/social/place.h
 
-CONFIG += debug
+CONFIG += qt debug
+QT = core gui qml quick widgets