[bugfix] qmake typo and fixing QList.append compiling error

klesh · Feb 2, 2020 · f1dd39e · f1dd39e
1 parent 70fca2e
commit f1dd39e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@
 ```
 $ git clone https://github.com/klesh/libqcurl.git
 $ cd libqcurl
-$ make builds && cd builds
-$ qmake && make && sudo make install
+& mkdir builds && cd builds
+$ qmake .. && make && sudo make install
 $ pkg-config --libs libqcurl
 ```
 

diff --git a/libqcurl/libqcurl.pro b/libqcurl/libqcurl.pro
@@ -81,7 +81,8 @@ unix {
     QMAKE_PKGCONFIG_NAME = libqcurl
     QMAKE_PKGCONFIG_FILE = libqcurl
     QMAKE_PKGCONFIG_DESCRIPTION = Make Network Access easier on Qt with curl
-    QMAKE_PKGCONFIG_PREFIX = $$QMAKE_PKGCONFIG_PREFIX
+#    QMAKE_PKGCONFIG_PREFIX = $$QMAKE_PKGCONFIG_PREFIX
+    QMAKE_PKGCONFIG_PREFIX = /usr
     QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib
     QMAKE_PKGCONFIG_INCDIR = ${prefix}/include
     QMAKE_PKGCONFIG_VERSION = $$VERSION

diff --git a/tests/test_http/tst_http.cpp b/tests/test_http/tst_http.cpp
@@ -79,7 +79,7 @@ void Http::testPost()
 
     // post ordinary form
     QCurlForm form;
-    form.append({"hello", "world"});
+    form.append(QPair<QString, QString>({"hello", "world"}));
     auto res3 = QCurl::post(QUrl("http://localhost:7880/form"), form);
     QCOMPARE(res3.responseText(), "world");
 
@@ -99,7 +99,7 @@ void Http::testPost()
 
     // upload file by multipart
     QCurlMultipart parts;
-    parts.append({"filename", "plaintextfile.txt"});
+    parts.append(QPair<QString, QString>({"filename", "plaintextfile.txt"}));
 
     const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
     const int randomStringLength = 1024 * 23; // assuming you want random strings of 12 characters