diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-29 09:05:36 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-29 09:06:37 +0200 |
| commit | 1491065506eb97c9def93b908db1df9fcdf3fff0 (patch) | |
| tree | 8241e72cc1016b41c08f9d14e81fb63c07e6a5ba /tools/configure/environment.h | |
| parent | 551e1e63d9da18787ae72fc3f0e76f28dbe5f7e3 (diff) | |
| parent | 61c775684fe38f3c1e1bc7599e21054aedba523c (diff) | |
Merge branch 'buildsystem' (second round)
refactoring and cleanup. fixes x-builds between different os families.
Conflicts:
mkspecs/features/qt.prf
Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91
Diffstat (limited to 'tools/configure/environment.h')
| -rw-r--r-- | tools/configure/environment.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 979d538e8a..58e9c18137 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -67,9 +67,7 @@ public: static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv); static QString execute(const QString &command, int *returnCode = 0); - static bool cpdir(const QString &srcDir, - const QString &destDir, - const QString &includeSrcDir = QString()); + static bool cpdir(const QString &srcDir, const QString &destDir); static bool rmdir(const QString &name); private: |