summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@nokia.com>2012-03-27 16:37:33 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-03-27 16:41:08 +0200
commit1da95bc12900dc90793cb06d9166dd0a815f5c69 (patch)
tree5f980dfef4c9aa3862c19c42b7f4d3708b9a0ca4 /src/tools
parenta3d244e9706ae9534abbb17f1e4a38e9a0c6909d (diff)
downloadqt-creator-1da95bc12900dc90793cb06d9166dd0a815f5c69.tar.gz
Remove usages of Q_GLOBAL_STATIC_WITH_INITIALIZER in Qt Creator
Q_GLOBAL_STATIC_WITH_INITIALIZER will be removed in Qt5, since it interferes with multi threading. Change-Id: I2013091ecb0613a168cd77f56ac88edb3b97fe1d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/screenshotcropper/screenshotcropperwindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.h b/src/tools/screenshotcropper/screenshotcropperwindow.h
index ea1f8c8912..5a6746aa80 100644
--- a/src/tools/screenshotcropper/screenshotcropperwindow.h
+++ b/src/tools/screenshotcropper/screenshotcropperwindow.h
@@ -58,7 +58,7 @@ public slots:
void saveData();
private:
- AreasOfInterest m_areasOfInterest;
+ QMap<QString, QRect> m_areasOfInterest;
QString m_areasOfInterestFile;
QString m_imagesFolder;
Ui::ScreenShotCropperWindow *ui;