diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-08 13:02:52 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-08 17:09:55 +0200 |
| commit | f47c101b8b03776ac874732684f9f7d1af4176e3 (patch) | |
| tree | f4cb68907b9e6cd77dd4fef7798045ecd7aced84 /src/plugins/cpptools/cppheadersource_test.cpp | |
| parent | 171fd691c397dcbd03e7d5bb2cb3d3b4845158a9 (diff) | |
| download | qt-creator-f47c101b8b03776ac874732684f9f7d1af4176e3.tar.gz | |
Revert "EditorManager: Fix crash when closing an editor upon activation"
Deleting an editor while currentEditorChanged is apparently not a good
idea.
Use a queued connection instead.
This reverts commits 243a6259618e69b8da9ac2438480c449754f7f77,
447c4ed37f8904ca733d6e6253ad19bb0388f209,
d9602ca550c53e60a5229bfec9539e41fa5a694c and
31034870389a512e3450e32ed990e1622bd6e679.
Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppheadersource_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppheadersource_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppheadersource_test.cpp b/src/plugins/cpptools/cppheadersource_test.cpp index e693759856..26d833d1c4 100644 --- a/src/plugins/cpptools/cppheadersource_test.cpp +++ b/src/plugins/cpptools/cppheadersource_test.cpp @@ -30,7 +30,7 @@ #include "cpptoolsplugin.h" #include "cpptoolsreuse.h" -#include <coreplugin/plugintestutils.h> +#include <coreplugin/testdatadir.h> #include <QDir> #include <QtTest> @@ -46,7 +46,7 @@ void CppToolsPlugin::test_headersource() QFETCH(QString, headerFileName); bool wasHeader; - Core::Tests::TestDataDir dataDir( + Core::Internal::Tests::TestDataDir dataDir( _(SRCDIR "/../../../tests/cppheadersource/") + _(QTest::currentDataTag())); const QString sourcePath = dataDir.file(sourceFileName); |