diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 16:17:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-27 08:19:11 +0000 |
| commit | 16a77b72c4821ba415665e16a915a9a38553c92d (patch) | |
| tree | c02883aaaff14345532d27d5eed47a85e6e1865e | |
| parent | c27a4d0980f57e31a7e0773b921e015bf4736119 (diff) | |
| download | qbs-16a77b72c4821ba415665e16a915a9a38553c92d.tar.gz | |
Sort declarations of test slots alphabetically.
If we want to keep them sorted, let's do it properly.
Change-Id: I4c718508e51c0d05f9460068d635199cabc3d308
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | src/lib/corelib/language/tst_language.h | 10 | ||||
| -rw-r--r-- | src/lib/corelib/tools/tst_tools.h | 4 | ||||
| -rw-r--r-- | tests/auto/api/tst_api.h | 8 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.h | 86 |
4 files changed, 54 insertions, 54 deletions
diff --git a/src/lib/corelib/language/tst_language.h b/src/lib/corelib/language/tst_language.h index a3c2838e3..4707e8722 100644 --- a/src/lib/corelib/language/tst_language.h +++ b/src/lib/corelib/language/tst_language.h @@ -70,7 +70,6 @@ private slots: void buildConfigStringListSyntax(); void builtinFunctionInSearchPathsProperty(); void canonicalArchitecture(); - void rfc1034Identifier(); void conditionalDepends(); void dependencyOnAllProfiles(); void environmentVariable(); @@ -78,10 +77,12 @@ private slots: void erroneousFiles(); void exports(); void fileContextProperties(); - void getNativeSetting(); + void fileTags_data(); + void fileTags(); void groupConditions_data(); void groupConditions(); void groupName(); + void getNativeSetting(); void homeDirectory(); void identifierSearch_data(); void identifierSearch(); @@ -99,15 +100,14 @@ private slots: void modules(); void outerInGroup(); void pathProperties(); - void profileValuesAndOverriddenValues(); void productConditions(); void productDirectories(); + void profileValuesAndOverriddenValues(); void propertiesBlocks_data(); void propertiesBlocks(); void qualifiedId(); void recursiveProductDependencies(); - void fileTags_data(); - void fileTags(); + void rfc1034Identifier(); void wildcards_data(); void wildcards(); }; diff --git a/src/lib/corelib/tools/tst_tools.h b/src/lib/corelib/tools/tst_tools.h index b984639da..d9e4e8fc2 100644 --- a/src/lib/corelib/tools/tst_tools.h +++ b/src/lib/corelib/tools/tst_tools.h @@ -44,11 +44,11 @@ public: TestTools(Settings *settings); private slots: - void testFileInfo(); void fileCaseCheck(); - void testProfiles(); void testBuildConfigMerging(); + void testFileInfo(); void testProcessNameByPid(); + void testProfiles(); private: Settings * const m_settings; diff --git a/tests/auto/api/tst_api.h b/tests/auto/api/tst_api.h index b5a64fab5..ca832f4a2 100644 --- a/tests/auto/api/tst_api.h +++ b/tests/auto/api/tst_api.h @@ -66,9 +66,8 @@ private slots: #ifdef QBS_ENABLE_PROJECT_FILE_UPDATES void changeContent(); #endif - void commandExtraction(); void changeDependentLib(); - void enableAndDisableProduct(); + void commandExtraction(); void disabledInstallGroup(); void disabledProduct(); void disabledProject(); @@ -77,6 +76,7 @@ private slots: void dynamicLibs(); void emptyFileTagList(); void emptySubmodulesList(); + void enableAndDisableProduct(); void explicitlyDependsOn(); void exportSimple(); void exportWithRecursiveDepends(); @@ -93,8 +93,8 @@ private slots: void multiArch(); void newOutputArtifactInDependency(); void newPatternMatch(); - void nonexistingProjectPropertyFromProduct(); void nonexistingProjectPropertyFromCommandLine(); + void nonexistingProjectPropertyFromProduct(); void objC(); void projectInvalidation(); void projectLocking(); @@ -103,9 +103,9 @@ private slots: void propertiesBlocks(); void rc(); void references(); + void removeFileDependency(); void renameProduct(); void renameTargetArtifact(); - void removeFileDependency(); void resolveProject(); void resolveProject_data(); void resolveProjectDryRun(); diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h index 597a3fa27..c9ac29cde 100644 --- a/tests/auto/blackbox/tst_blackbox.h +++ b/tests/auto/blackbox/tst_blackbox.h @@ -99,6 +99,8 @@ private slots: void changedFiles_data(); void changedFiles(); void changeInDisabledProduct(); + void checkProjectFilePath(); + void clean(); void dependenciesProperty(); void dynamicMultiplexRule(); void dynamicRuleOutputs(); @@ -106,10 +108,13 @@ private slots: void erroneousFiles(); void exportRule(); void fileDependencies(); - void installedTransformerOutput(); + void groupsInModules(); void inputsFromDependencies(); - void installPackage(); void installable(); + void installedApp(); + void installedSourceFiles(); + void installedTransformerOutput(); + void installPackage(); void installTree(); void java(); void jsExtensionsFile(); @@ -119,69 +124,64 @@ private slots: void jsExtensionsTextFile(); void listPropertiesWithOuter(); void listPropertyOrder(); + void missingProfile(); void mixedBuildVariants(); void multipleChanges(); void nestedProperties(); void nonBrokenFilesInBrokenProduct(); void nonDefaultProduct(); - void propertyPrecedence(); - void qmlDebugging(); + void overrideProjectProperties(); + void probesInNestedModules(); void productDependenciesByType(); + void productProperties(); + void propertyChanges(); + void propertyPrecedence(); void properQuoting(); + void qbsVersion(); + void qmlDebugging(); + void qobjectInObjectiveCpp(); void radAfterIncompleteBuild_data(); void radAfterIncompleteBuild(); + void recursiveRenaming(); + void recursiveWildcards(); + void ruleConditions(); + void ruleCycle(); void subProfileChangeTracking(); void symlinkRemoval(); - void usingsAsSoleInputsNonMultiplexed(); - void clean(); void renameDependency(); void separateDebugInfo(); void sevenZip(); void tar(); - void zip(); - void zip_data(); - void track_qrc(); - void track_qobject_change(); - void trackAddFile(); - void trackExternalProductChanges(); - void trackRemoveFile(); - void trackAddFileTag(); - void trackRemoveFileTag(); - void trackAddMocInclude(); - void trackAddProduct(); - void trackRemoveProduct(); - void wildcardRenaming(); - void recursiveRenaming(); - void recursiveWildcards(); - void ruleConditions(); - void ruleCycle(); - void overrideProjectProperties(); - void productProperties(); - void propertyChanges(); - void qobjectInObjectiveCpp(); - void installedApp(); - void installedSourceFiles(); - void toolLookup(); - void checkProjectFilePath(); - void missingProfile(); void testAssembly(); - void testNsis(); + void testAssetCatalog(); + void testBadInterpreter(); void testEmbedInfoPlist(); void testFrameworkStructure(); - void testWiX(); - void testNodeJs(); - void testTypeScript(); void testIconset(); void testIconsetApp(); - void testAssetCatalog(); - void testObjcArc(); - void wildCardsAndRules(); void testLoadableModule(); - void testBadInterpreter(); - void qbsVersion(); + void testNodeJs(); + void testNsis(); + void testObjcArc(); + void testTypeScript(); + void testWiX(); + void toolLookup(); + void track_qobject_change(); + void track_qrc(); + void trackAddFile(); + void trackAddFileTag(); + void trackAddMocInclude(); + void trackAddProduct(); + void trackExternalProductChanges(); + void trackRemoveFile(); + void trackRemoveFileTag(); + void trackRemoveProduct(); void transitiveOptionalDependencies(); - void groupsInModules(); - void probesInNestedModules(); + void usingsAsSoleInputsNonMultiplexed(); + void wildCardsAndRules(); + void wildcardRenaming(); + void zip(); + void zip_data(); private: QString findArchiver(const QString &fileName, int *status = nullptr); |
