The thermotolerance effect of heat hardening (also called short-term acclimation), knockdown resistance to high temperature (KRHT) with and without heat hardening and chill-coma recovery (CCR) are important phenotypes of thermal adaptation in insects and other organisms. Drosophila melanogaster from Denmark and Australia were previously selected for low and high KRHT, respectively. These flies were crossed to construct recombinant inbred lines (RIL). KRHT was higher in heat-hardened than in nonhardened RIL. We quantify the heat-hardening effect (HHE) as the ratio in KRHT between heat-hardened and nonhardened RIL. Composite interval mapping revealed a more complex genetic architecture for KRHT without heat-hardening than for KRHT in heat-hardened insects. Five quantitative trait loci (QTL) were found for KRHT, but only two of them were significant after heat hardening. KRHT and CCR showed trade-off associations for QTL both in the middle of chromosome 2 and the right arm of chromosome 3, which should be the result of either pleiotropy or linkage. The major QTL on chromosome 2 explained 18% and 27–33% of the phenotypic variance in CCR and KRHT in nonhardened flies, respectively, but its KRHT effects decreased by heat hardening. We discuss candidate loci for each QTL. One HHE-QTL was found in the region of small heat-shock protein genes. However, HHE-QTL explained only a small fraction of the phenotypic variance. Most heat-resistance QTL did not colocalize with CCR-QTL. Large-effect QTL for CCR and KRHT without hardening (basal thermotolerance) were consistent across continents, with apparent transgressive segregation for CCR. HHE (inducible thermotolerance) was not regulated by large-effect QTL.