diff --git a/src/libs/utils/abstractprocess.h b/src/libs/utils/abstractprocess.h index d3671f55a4085e50ec2f83ab33bf7767748b1365..b7edcd889ec9cfe20a0184e776306c02b8994928 100644 --- a/src/libs/utils/abstractprocess.h +++ b/src/libs/utils/abstractprocess.h @@ -37,7 +37,7 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT AbstractProcess +class QTCREATOR_UTILS_EXPORT AbstractProcess { public: AbstractProcess() {} diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h index a57d04b49a33d362cf36ed61cdef8f0da85c6b63..fc619047d9a43bd6b9f88b07ef2f0d9002b307fb 100644 --- a/src/libs/utils/basevalidatinglineedit.h +++ b/src/libs/utils/basevalidatinglineedit.h @@ -50,7 +50,7 @@ struct BaseValidatingLineEditPrivate; * "<Enter name here>". This results in state 'DisplayingInitialText', which * is not valid, but is not marked red. */ -class QWORKBENCH_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit +class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit { Q_OBJECT Q_DISABLE_COPY(BaseValidatingLineEdit) diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index 69fb4f749893ab9161a495e1bcf7748b483ad5f0..e5a980e018b30fcee1842c0e2f2854493cbf3115 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -41,7 +41,7 @@ struct ClassNameValidatingLineEditPrivate; /* A Line edit that validates a C++ class name and emits a signal * to derive suggested file names from it. */ -class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit +class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit : public Core::Utils::BaseValidatingLineEdit { Q_DISABLE_COPY(ClassNameValidatingLineEdit) diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp index 7e019b67c2200af39b5170f2491010cb6c367ecd..b20e5598c80cac8f1ebf922b5c47a4f437e6c6d8 100644 --- a/src/libs/utils/codegeneration.cpp +++ b/src/libs/utils/codegeneration.cpp @@ -53,7 +53,7 @@ static QString toAlphaNum(const QString &s) return rc; } -QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file) +QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file) { const QFileInfo fi(file); QString rc = toAlphaNum(fi.completeBaseName()).toUpper(); @@ -62,7 +62,7 @@ QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file) return rc; } -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT void writeIncludeFileDirective(const QString &file, bool globalInclude, QTextStream &str) { @@ -71,7 +71,7 @@ void writeIncludeFileDirective(const QString &file, bool globalInclude, str << QLatin1String("#include ") << opening << file << closing << QLatin1Char('\n'); } -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT QString writeOpeningNameSpaces(const QStringList &l, const QString &indent, QTextStream &str) { @@ -87,7 +87,7 @@ QString writeOpeningNameSpaces(const QStringList &l, const QString &indent, return rc; } -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT void writeClosingNameSpaces(const QStringList &l, const QString &indent, QTextStream &str) { diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index 874bb12dcf4fd8e48dec078ae489d6b9da6cfdcf..03b2a578328174fa1fcf7250b0342dc0207b65eb 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -41,22 +41,22 @@ QT_END_NAMESPACE namespace Core { namespace Utils { -QWORKBENCH_UTILS_EXPORT QString headerGuard(const QString &file); +QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file); -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT void writeIncludeFileDirective(const QString &file, bool globalInclude, QTextStream &str); // Write opening namespaces and return an indentation string to be used // in the following code if there are any. -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT QString writeOpeningNameSpaces(const QStringList &namespaces, const QString &indent, QTextStream &str); // Close namespacesnamespaces -QWORKBENCH_UTILS_EXPORT +QTCREATOR_UTILS_EXPORT void writeClosingNameSpaces(const QStringList &namespaces, const QString &indent, QTextStream &str); diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 4604a1f6752611f06d64c8677f03713d5913252b..f753bc9cae21ca3b360a33bee4e6d513f4531ccb 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -54,7 +54,7 @@ QT_END_NAMESPACE namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess +class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess { Q_OBJECT diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index c06e39d7b17cf9cfa5db83707487fe60bd0a9475..0c1447eb188a8a63657d20bbd7eaf2567342fe6c 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -46,7 +46,7 @@ class FancyLineEditPrivate; * text if isShowingHintText() returns true (that is, does not contain * valid user input). */ -class QWORKBENCH_UTILS_EXPORT FancyLineEdit : public QLineEdit +class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit { Q_DISABLE_COPY(FancyLineEdit) Q_OBJECT diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h index 60145bdf4ca12400a6377cea17304e40704ef2a7..36491be1b853a05404085e8ae34ea95cf2bbee68 100644 --- a/src/libs/utils/filenamevalidatinglineedit.h +++ b/src/libs/utils/filenamevalidatinglineedit.h @@ -39,7 +39,7 @@ namespace Utils { * A control that let's the user choose a file name, based on a QLineEdit. Has * some validation logic for embedding into QWizardPage. */ -class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit +class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit { Q_OBJECT Q_DISABLE_COPY(FileNameValidatingLineEdit) diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index 1fbc4d1104852de5afbce88dd3ae42216a567c54..b5d24c7c7eb894144e594fd5a0a1217e846d389c 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -39,7 +39,7 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT FileSearchResult +class QTCREATOR_UTILS_EXPORT FileSearchResult { public: FileSearchResult() {} @@ -54,10 +54,10 @@ public: int matchLength; }; -QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files, +QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files, QTextDocument::FindFlags flags); -QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files, +QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files, QTextDocument::FindFlags flags); } // namespace Utils diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h index b27e12d587ea2952727a4752e325134acfdec6c1..879c7d9fe3d20d139b33e466e4e803842c88e1ad 100644 --- a/src/libs/utils/filewizarddialog.h +++ b/src/libs/utils/filewizarddialog.h @@ -44,7 +44,7 @@ class FileWizardPage; and path. Custom pages can be added via Core::IWizardExtension. */ -class QWORKBENCH_UTILS_EXPORT FileWizardDialog : public QWizard { +class QTCREATOR_UTILS_EXPORT FileWizardDialog : public QWizard { Q_OBJECT Q_DISABLE_COPY(FileWizardDialog) public: diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index b41839e0bfc92aaaa5b8818ad91244fd24f9834b..1c5438f43d6ad7314e56acc80c8eb11efe2e2295 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -46,7 +46,7 @@ struct FileWizardPagePrivate; * The name and path labels can be changed. By default they are simply "Name:" * and "Path:". */ -class QWORKBENCH_UTILS_EXPORT FileWizardPage : public QWizardPage +class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage { Q_OBJECT Q_DISABLE_COPY(FileWizardPage) diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h index 01a577a21e612d9cebecc8579d2cb8e9919f2ef9..b5c44d2ae665785972b36f9dafc78546a3c47d7d 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/linecolumnlabel.h @@ -39,7 +39,7 @@ namespace Utils { /* A label suitable for displaying cursor positions, etc. with a fixed * with derived from a sample text. */ -class QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel +class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel { Q_DISABLE_COPY(LineColumnLabel) Q_OBJECT diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index 674adf6c84bbab4a25386cbeb2898c642eb4bcf5..29a5faa166a5c2189b6ddf7757ca804fd9b19611 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -49,7 +49,7 @@ struct NewClassWidgetPrivate; * names for header, source and form files. Has some smart logic to derive * the file names from the class name. */ -class QWORKBENCH_UTILS_EXPORT NewClassWidget : public QWidget +class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget { Q_DISABLE_COPY(NewClassWidget) Q_OBJECT diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index 24c33fe62158fefcdf7e62142faf00e62b9ab2af..f5e6b9ea1f767e4d08c0c087f8bad1e6c0c94c29 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -43,7 +43,7 @@ struct PathChooserPrivate; * A control that let's the user choose a path, consisting of a QLineEdit and * a "Browse" button. Has some validation logic for embedding into QWizardPage. */ -class QWORKBENCH_UTILS_EXPORT PathChooser : public QWidget +class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget { Q_DISABLE_COPY(PathChooser) Q_OBJECT diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index b97a616bef6a454d6a0f56ecede79ab481566912..9b7d536a95bf5b5dc6b2292affbc8e32761bdd78 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -55,7 +55,7 @@ struct PathListEditorPrivate; * by new line characters for convenience. */ -class QWORKBENCH_UTILS_EXPORT PathListEditor : public QWidget +class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget { Q_DISABLE_COPY(PathListEditor) Q_OBJECT diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index e6bc7ebd70ce57763a5d8311bd2327064fea41cf..d0d2ae0ecdb7042ee341aa835dbd8ff69575f9ca 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -52,7 +52,7 @@ struct ProjectIntroPagePrivate; * layout, otherwise, QWizard will squeeze it due to its strange expanding * hacks. */ -class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage +class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage { Q_OBJECT Q_DISABLE_COPY(ProjectIntroPage) diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h index 7d40a525074f4614283c6b627acd98ec298130cc..10659c865a5df38f6210a406155ad25eadea1131 100644 --- a/src/libs/utils/projectnamevalidatinglineedit.h +++ b/src/libs/utils/projectnamevalidatinglineedit.h @@ -35,7 +35,7 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit +class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit { Q_OBJECT Q_DISABLE_COPY(ProjectNameValidatingLineEdit) diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index 06c2cadc9ed3ac57cf37497ca9038c8f62ec0cce..22f7e945ef9352952cbacf8313b0abb7b8abb757 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -37,7 +37,7 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT QtColorButton : public QToolButton +class QTCREATOR_UTILS_EXPORT QtColorButton : public QToolButton { Q_OBJECT Q_PROPERTY(bool backgroundCheckered READ isBackgroundCheckered WRITE setBackgroundCheckered) diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index c25dda1bad1f4d7f986d201238ea6171346f2a52..befa54308d51824dab8484d32815a917d5e904c6 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -34,7 +34,7 @@ using namespace Core; using namespace Core::Utils; -QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer +QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer Core::Utils::reloadPrompt(const QString &fileName, QWidget *parent) { return reloadPrompt(QObject::tr("File Changed"), @@ -42,7 +42,7 @@ QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer parent); } -QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer +QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent) { switch (QMessageBox::question(parent, title, prompt, diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index 6741bd09fff5d409280eb0eeac2b89bac4df88de..2a79585c23a695679c80cdf7eeec25de2c317c17 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -42,8 +42,8 @@ namespace Utils { enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone }; -QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent); -QWORKBENCH_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent); +QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName, QWidget *parent); +QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent); } // namespace Utils } // namespace Core diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h index 53eaa047c811ad54a7a0627243ce5ea8dfd48dbf..b75c269b3e340abb06c26197d7ba744b4c9b3493 100644 --- a/src/libs/utils/savedaction.h +++ b/src/libs/utils/savedaction.h @@ -48,7 +48,7 @@ namespace Utils { enum ApplyMode { ImmediateApply, DeferedApply }; -class QWORKBENCH_UTILS_EXPORT SavedAction : public QAction +class QTCREATOR_UTILS_EXPORT SavedAction : public QAction { Q_OBJECT @@ -106,7 +106,7 @@ private: ApplyMode m_applyMode; }; -class QWORKBENCH_UTILS_EXPORT SavedActionSet +class QTCREATOR_UTILS_EXPORT SavedActionSet { public: SavedActionSet() {} diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp index 49c8c769b8109a6206598937ae9b5691a9a433e8..d753670840ed271492d0444ba1c0ddc392484943 100644 --- a/src/libs/utils/settingsutils.cpp +++ b/src/libs/utils/settingsutils.cpp @@ -34,7 +34,7 @@ namespace Core { namespace Utils { -QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category) +QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category) { QString rc(category); const QChar underscore = QLatin1Char('_'); diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index 728f2588c7c96fb3bd34671265ce70356e8b0768..4e8fd021ffac70c2340935c4505abe9c02f391e2 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -37,7 +37,7 @@ namespace Utils { // Create a usable settings key from a category, // for example Editor|C++ -> Editor_C__ -QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category); +QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category); } // namespace Utils } // namespace Core diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h index 2cf9c096357861e1586862e7d71350ff701f13d7..a8be66fe1e181dbeed7aa789581280557665bb3d 100644 --- a/src/libs/utils/submiteditorwidget.h +++ b/src/libs/utils/submiteditorwidget.h @@ -68,7 +68,7 @@ struct SubmitEditorWidgetPrivate; * Care should be taken to ensure the widget is deleted properly when the * editor closes. */ -class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget +class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget { Q_OBJECT Q_DISABLE_COPY(SubmitEditorWidget) diff --git a/src/libs/utils/submitfieldwidget.h b/src/libs/utils/submitfieldwidget.h index 34a959c5efa4e813846586208a3cce1dbb333c39..08e834bfb49feebd9de252f8f7f1b2b1177df0c1 100644 --- a/src/libs/utils/submitfieldwidget.h +++ b/src/libs/utils/submitfieldwidget.h @@ -20,7 +20,7 @@ struct SubmitFieldWidgetPrivate; * When choosing a different field in the combo, a new row is opened if text * has been entered for the current field. Optionally, a "Browse..." button and * completer can be added. */ -class QWORKBENCH_UTILS_EXPORT SubmitFieldWidget : public QWidget +class QTCREATOR_UTILS_EXPORT SubmitFieldWidget : public QWidget { Q_OBJECT Q_PROPERTY(QStringList fields READ fields WRITE setFields DESIGNABLE true) diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 72c324a67fa1bbe4b0b622bdf746f3aeb6a67e28..81b02ca719250e36aa6ee4e201860849c4dd09cd 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -60,7 +60,7 @@ void SynchronousProcessResponse::clear() stdErr.clear(); } -QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r) +QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse& r) { QDebug nsp = str.nospace(); nsp << "SynchronousProcessResponse: result=" << r.result << " ex=" << r.exitCode << '\n' diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index 5f1425befea6917d5db3984beabee360a172b06d..8f1b5e70248a880af9df533fb8a5a60ccb634f0d 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -48,7 +48,7 @@ namespace Utils { struct SynchronousProcessPrivate; /* Result of SynchronousProcess execution */ -struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse +struct QTCREATOR_UTILS_EXPORT SynchronousProcessResponse { enum Result { // Finished with return code 0 @@ -71,7 +71,7 @@ struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse QString stdErr; }; -QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &); +QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessResponse &); /* SynchronousProcess: Runs a synchronous process in its own event loop * that blocks only user input events. Thus, it allows for the gui to @@ -85,7 +85,7 @@ QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessRe * stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled(). * They would typically be used for log windows. */ -class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject +class QTCREATOR_UTILS_EXPORT SynchronousProcess : public QObject { Q_OBJECT public: diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index 0480e58422e0845fdbf97cdd84adf851e32fd71b..345ef4aab3e550269d5b05b953540a73b73aa818 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = Utils QT += gui network -DEFINES += QWORKBENCH_UTILS_LIBRARY +DEFINES += QTCREATOR_UTILS_LIBRARY include(../../qtcreatorlibrary.pri) diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h index 17917d043428ce68cf540d7e119fccbfbbb1e980..ff1738c58c9a95ebbea6c0da4bd8af57e2a1c16c 100644 --- a/src/libs/utils/utils_global.h +++ b/src/libs/utils/utils_global.h @@ -32,10 +32,10 @@ #include <QtCore/qglobal.h> -#if defined(QWORKBENCH_UTILS_LIBRARY) -# define QWORKBENCH_UTILS_EXPORT Q_DECL_EXPORT +#if defined(QTCREATOR_UTILS_LIBRARY) +# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT #else -# define QWORKBENCH_UTILS_EXPORT Q_DECL_IMPORT +# define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT #endif #endif // UTILS_GLOBAL_H diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 3fd789707e6812e8ee3840b903811e4b44092bd0..c351c8544c8f8df07a4174e907a2cb59a3b84b42 100644 --- a/src/libs/utils/winutils.cpp +++ b/src/libs/utils/winutils.cpp @@ -35,7 +35,7 @@ namespace Core { namespace Utils { -QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error) +QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error) { QString rc = QString::fromLatin1("#%1: ").arg(error); ushort *lpMsgBuf; diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h index 112537502998213a2259492ab6d93786d50d4b97..dbd0e1f1dbcf0f9f6dbf80892bfd81960ac1dc4c 100644 --- a/src/libs/utils/winutils.h +++ b/src/libs/utils/winutils.h @@ -41,7 +41,7 @@ namespace Utils { // Helper to format a Windows error message, taking the // code as returned by the GetLastError()-API. -QWORKBENCH_UTILS_EXPORT QString winErrorMessage(unsigned long error); +QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error); } // namespace Utils } // namespace Core