diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-27 18:03:30 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-27 18:15:52 +0100 |
| commit | c56b691908f7edbb6d6f74ba2d1d20cf2b7f4e9d (patch) | |
| tree | 068599e3ca46fbd7747a4bbc7065e2cf2e99e1d6 /tests/auto/api/tst_api.h | |
| parent | a58db5f072bf9c63f95c34a426d30f4cf78a1858 (diff) | |
| parent | 6cc09920176a53e43c695ab3e0a572ca2dae46cf (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
src/lib/corelib/tools/version.h
tests/auto/api/testdata/disable-product/project.qbs
tests/auto/api/testdata/disabled-product/disabledProduct.qbs
tests/auto/api/testdata/disabled-product/main.cpp
tests/auto/blackbox/tst_blackbox.cpp
tests/auto/blackbox/tst_blackbox.h
Change-Id: Ic45aa1b70946fd3e037ecce56f1cd7c414ca832c
Diffstat (limited to 'tests/auto/api/tst_api.h')
| -rw-r--r-- | tests/auto/api/tst_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/api/tst_api.h b/tests/auto/api/tst_api.h index 1198e0c1c..47bfb829d 100644 --- a/tests/auto/api/tst_api.h +++ b/tests/auto/api/tst_api.h @@ -66,10 +66,10 @@ private slots: void changeContent(); #endif void changeDependentLib(); + void enableAndDisableProduct(); void disabledInstallGroup(); void disabledProduct(); void disabledProject(); - void disableProduct(); void duplicateProductNames(); void duplicateProductNames_data(); void dynamicLibs(); |