diff options
Diffstat (limited to 'tests/auto/tools/qmake/testdata')
11 files changed, 32 insertions, 18 deletions
diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/include folder/header.h b/tests/auto/tools/qmake/testdata/quotedfilenames/include folder/header.h new file mode 100644 index 0000000000..595c0cac3c --- /dev/null +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/include folder/header.h @@ -0,0 +1 @@ +/* a random header file */ diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp index 4cbb8f8b09..2a56d5b59b 100644 --- a/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ - +#include <header.h> #include <qguiapplication.h> diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro index 61d6f38696..c4e0257769 100644 --- a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro @@ -2,8 +2,12 @@ TEMPLATE = app TARGET = quotedfilenames SOURCES = main.cpp +CONFIG += no_batch + +INCLUDEPATH += "include folder" + RCCINPUT = "rc folder/test.qrc" -RCCOUTPUT = test.cpp +RCCOUTPUT = "cpp folder/test.cpp" qtPrepareTool(QMAKE_RCC, rcc) diff --git a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro index c57a1c877c..0e78a91f46 100644 --- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro @@ -3,5 +3,5 @@ HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp RESOURCES = test.qrc -TARGET = simple_app -DESTDIR = ./ +TARGET = "simple app" +DESTDIR = "dest dir" diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro index f589d2b3d4..c427309b2a 100644 --- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro @@ -10,5 +10,5 @@ VERSION = 1.0.0 INCLUDEPATH += . tmp MOC_DIR = tmp OBJECTS_DIR = tmp -TARGET = simple_dll -DESTDIR = ./ +TARGET = "simple dll" +DESTDIR = "dest dir" diff --git a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro index 9abc3e9f26..cd6c7dd7f9 100644 --- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro +++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro @@ -9,5 +9,5 @@ VERSION = 1.0.0 INCLUDEPATH += . tmp MOC_DIR = tmp OBJECTS_DIR = tmp -TARGET = simple_lib -DESTDIR = ./ +TARGET = "simple lib" +DESTDIR = "dest dir" diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp index 332dde7e2f..3bc36acdb0 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ - +#include <simple.h> #include "test_file.h" #include <qguiapplication.h> @@ -39,6 +39,7 @@ int main( int argc, char **argv ) { QGuiApplication a( argc, argv ); + Simple s; SomeObject sc; return a.exec(); } diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro index d63f1d4362..e882c33b3d 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro @@ -2,5 +2,8 @@ TEMPLATE = app HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp -TARGET = simple_app -DESTDIR = ./ +TARGET = "simple app" +DESTDIR = "dest dir" + +INCLUDEPATH += ../simple_dll +LIBS += -L"../simple_dll/dest dir" -l"simple dll" diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h index d7e5f48730..e24df46f42 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h @@ -35,8 +35,13 @@ #include <qstring.h> -//class SIMPLEDLL_EXPORT Simple -class Simple +#ifdef SIMPLEDLL_MAKEDLL +# define SIMPLEDLL_EXPORT Q_DECL_EXPORT +#else +# define SIMPLEDLL_EXPORT Q_DECL_IMPORT +#endif + +class SIMPLEDLL_EXPORT Simple { public: Simple(); diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro index f589d2b3d4..4e362bb918 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += dll -win32:DEFINES += SIMPLEDLL_MAKEDLL +DEFINES += SIMPLEDLL_MAKEDLL HEADERS = simple.h SOURCES = simple.cpp @@ -10,5 +10,5 @@ VERSION = 1.0.0 INCLUDEPATH += . tmp MOC_DIR = tmp OBJECTS_DIR = tmp -TARGET = simple_dll -DESTDIR = ./ +TARGET = "simple dll" +DESTDIR = "dest dir" diff --git a/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro b/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro index 5da200eabb..bc96812e6d 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro +++ b/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = simple_app \ - simple_dll +SUBDIRS = simple_dll \ + simple_app CONFIG += ordered |