diff options
author | João Abecasis <joao@abecasis.name> | 2009-04-02 13:47:54 (GMT) |
---|---|---|
committer | João Abecasis <joao@abecasis.name> | 2009-04-02 14:29:49 (GMT) |
commit | 0d026b267badbf7890b02256826f0ff3821fcec7 (patch) | |
tree | 4f0cc8d6371f08f113beee5f4002dad214fc5a6c /tests/auto/qmake/tst_qmake.cpp | |
parent | d9e3fd083217f3b03f211d64e7d78b36da90bf51 (diff) | |
download | Qt-0d026b267badbf7890b02256826f0ff3821fcec7.zip Qt-0d026b267badbf7890b02256826f0ff3821fcec7.tar.gz Qt-0d026b267badbf7890b02256826f0ff3821fcec7.tar.bz2 |
Spring cleaning in qmake tests
And some indentation fixes in qmake itself.
Fixes indentation; TRUE => true; FALSE => false; #includes and #defines
cleanup; removes dead code; comments... and somewhere along the way
marked a function static.
Reviewed-by: mariusSO
Diffstat (limited to 'tests/auto/qmake/tst_qmake.cpp')
-rw-r--r-- | tests/auto/qmake/tst_qmake.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp index 884a2c4..07389e9 100644 --- a/tests/auto/qmake/tst_qmake.cpp +++ b/tests/auto/qmake/tst_qmake.cpp @@ -39,19 +39,13 @@ ** ****************************************************************************/ - -#include <QtTest/QtTest> - #if !defined(QMAKE_CROSS_COMPILED) -#include <qdir.h> - #include "testcompiler.h" -#include <stdlib.h> - -//TESTED_CLASS= -//TESTED_FILES=corelib/tools/qlocale.h corelib/tools/qlocale.cpp +#include <QObject> +#include <QDir> +#include <QtTest/QtTest> class tst_qmake : public QObject { @@ -61,12 +55,12 @@ public: tst_qmake(); virtual ~tst_qmake(); - public slots: void initTestCase(); void cleanupTestCase(); void init(); void cleanup(); + private slots: void simple_app(); void simple_lib(); @@ -253,10 +247,10 @@ void tst_qmake::duplicateLibraryEntries() void tst_qmake::export_across_file_boundaries() { // This relies on features so we need to set the QMAKEFEATURES environment variable - putenv("QMAKEFEATURES=."); + putenv("QMAKEFEATURES=."); QString workDir = base_path + "/testdata/export_across_file_boundaries"; QVERIFY( test_compiler.qmake( workDir, "foo" )); - putenv("QMAKEFEATURES="); + putenv("QMAKEFEATURES="); } void tst_qmake::include_dir() |