diff options
| author | Oswald Buddenhagen <[email protected]> | 2014-08-05 14:24:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2014-08-05 14:24:23 +0200 |
| commit | f3a61e8bf7f5b8275c000a0cac70b561422d2230 (patch) | |
| tree | 0cf0631a5b53fdab930f8a7936aff9c9c1c0952f /src/plugins/cpptools/cpptoolsplugin.h | |
| parent | 59b34b6b539c78384ea3fc4fd018fe063b4ede53 (diff) | |
| parent | b2ac3fd90ccfc21cf4c5bce353d8e08208961eeb (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidglobal.h
Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 74fccf7179d..27de8d0ba4c 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -150,8 +150,8 @@ private slots: void test_modelmanager_gc_if_last_cppeditor_closed(); void test_modelmanager_dont_gc_opened_files(); void test_modelmanager_defines_per_project(); - void test_modelmanager_defines_per_project_pch(); void test_modelmanager_defines_per_editor(); + void test_modelmanager_precompiled_headers(); void test_cpplocatorfilters_CppLocatorFilter(); void test_cpplocatorfilters_CppLocatorFilter_data(); |