diff options
| author | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-05-05 16:26:54 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-05-07 09:34:48 +0000 |
| commit | 82322f3c7a10909bfff3a7648e9e82e112f5bd24 (patch) | |
| tree | eff218304bf9cd82e80ef3111597daecd95e15e3 | |
| parent | b5750a8d19930d238c80fb4db38974f34933852e (diff) | |
| download | qt-creator-82322f3c7a10909bfff3a7648e9e82e112f5bd24.tar.gz | |
windows is compiling
Change-Id: I58947e1f4e428bdc1394f0b58368eb07163b240c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
4 files changed, 12 insertions, 10 deletions
diff --git a/src/tools/codemodelbackend/ipcsource/clangstring.cpp b/src/tools/codemodelbackend/ipcsource/clangstring.cpp index 3418ad844d..5e40ef09da 100644 --- a/src/tools/codemodelbackend/ipcsource/clangstring.cpp +++ b/src/tools/codemodelbackend/ipcsource/clangstring.cpp @@ -51,16 +51,18 @@ bool ClangString::isNull() const ClangString &ClangString::operator =(ClangString &&clangString) { - using std::swap; - swap(cxString, clangString.cxString); + cxString = std::move(clangString.cxString); + clangString.cxString.data = nullptr; + clangString.cxString.private_flags = 0; return *this; } ClangString::ClangString(ClangString &&clangString) + : cxString(std::move(clangString.cxString)) { - using std::swap; - swap(cxString, clangString.cxString); + clangString.cxString.data = nullptr; + clangString.cxString.private_flags = 0; } ClangString::operator Utf8String() const diff --git a/src/tools/codemodelbackend/ipcsource/clangstring.h b/src/tools/codemodelbackend/ipcsource/clangstring.h index bc9aeb2316..0f6b86a4f2 100644 --- a/src/tools/codemodelbackend/ipcsource/clangstring.h +++ b/src/tools/codemodelbackend/ipcsource/clangstring.h @@ -54,7 +54,7 @@ public: bool isNull() const; private: - CXString cxString = { nullptr, 0 }; + CXString cxString; }; } // namespace CodeModelBackEnd diff --git a/src/tools/codemodelbackend/ipcsource/translationunit.h b/src/tools/codemodelbackend/ipcsource/translationunit.h index f4e94b4b45..c504c3b2c3 100644 --- a/src/tools/codemodelbackend/ipcsource/translationunit.h +++ b/src/tools/codemodelbackend/ipcsource/translationunit.h @@ -36,6 +36,8 @@ #include <chrono> #include <memory> +#include <QtGlobal> + class Utf8String; namespace CodeModelBackEnd { diff --git a/tests/unit/codemodelbackend/unittest/unittest.pro b/tests/unit/codemodelbackend/unittest/unittest.pro index 763136b6fd..0276c1e23c 100644 --- a/tests/unit/codemodelbackend/unittest/unittest.pro +++ b/tests/unit/codemodelbackend/unittest/unittest.pro @@ -81,11 +81,9 @@ OTHER_FILES += data/complete_testfile_1.cpp \ DEFINES += QT_NO_CAST_FROM_ASCII DEFINES += CODEMODELBACKEND_TESTS DEFINES += DONT_CHECK_COMMAND_COUNTER -DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_ +DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_ GTEST_LANG_CXX11 -copydata.commands = $(COPY_DIR) $$PWD/data $$OUT_PWD -first.depends = $(first) copydata -export(first.depends) -export(copydata.commands) +copydata.commands = $(COPY_DIR) $$shell_quote($$shell_path($$PWD/data)) $$shell_quote($$shell_path($$OUT_PWD/data)) +first.depends += copydata QMAKE_EXTRA_TARGETS += first copydata |