diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-04-16 18:58:13 +0100 |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2012-04-20 12:18:22 +0200 |
| commit | f03135fac258bdba2ac6814b0978a00096ce5130 (patch) | |
| tree | 96df9856052e9b7cde8fb93c484d34f3d2ab1230 | |
| parent | 7cf01577c238f65e9585f65a049fa0625edc4352 (diff) | |
Fix tests & examples for module build
Change-Id: Ic2d5d1a6efc0af1c1b2810da2d6916ed100ace4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | examples/qftp/ftpwindow.cpp | 1 | ||||
| -rw-r--r-- | examples/qftp/qftp.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qftp/qftp.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qftp/tst_qftp.cpp | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/examples/qftp/ftpwindow.cpp b/examples/qftp/ftpwindow.cpp index 26a934e..61ccec8 100644 --- a/examples/qftp/ftpwindow.cpp +++ b/examples/qftp/ftpwindow.cpp @@ -40,6 +40,7 @@ #include <QtWidgets> #include <QtNetwork> +#include <QtFtp> #include "ftpwindow.h" diff --git a/examples/qftp/qftp.pro b/examples/qftp/qftp.pro index c554b37..05c3fac 100644 --- a/examples/qftp/qftp.pro +++ b/examples/qftp/qftp.pro @@ -1,10 +1,8 @@ -QT += widgets - HEADERS = ftpwindow.h SOURCES = ftpwindow.cpp \ main.cpp RESOURCES += ftp.qrc -QT += network +QT += network ftp widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro index 1a154d3..4b0f5c8 100644 --- a/tests/auto/qftp/qftp.pro +++ b/tests/auto/qftp/qftp.pro @@ -3,9 +3,7 @@ TARGET = tst_qftp SOURCES += tst_qftp.cpp -QT = core network testlib -LIBS += -lqftp -INCLUDEPATH += "../../include" +QT = core network testlib ftp wince*: { addFiles.files = rfc3252.txt diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index d123b33..0801c91 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -45,7 +45,7 @@ #include <qcoreapplication.h> #include <qfile.h> #include <qbuffer.h> -#include "qftp.h" +#include <QtFtp/qftp.h> #include <qmap.h> #include <time.h> #include <stdlib.h> |