diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 01:45:22 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-28 10:18:11 -0700 |
| commit | d17ea24c73b5b58fa6f5d3f00d82de6f53459cfc (patch) | |
| tree | 4cf939e70277190dad948b16849320e4452c5d78 /src/app/config-ui | |
| parent | 440d78eca9011d13c88f0e0fd84f62661806eb49 (diff) | |
| parent | 33e9cd462a6c7b6dc552669361f4321ffdb22ff3 (diff) | |
Merge 1.5 into 1.6
Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
Diffstat (limited to 'src/app/config-ui')
| -rw-r--r-- | src/app/config-ui/config-ui.qbs | 4 | ||||
| -rw-r--r-- | src/app/config-ui/fgapp.mm | 2 | ||||
| -rw-r--r-- | src/app/config-ui/main.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index de1de7150..33fe36eae 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -14,7 +14,7 @@ QbsApp { ] Group { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") files: [ "fgapp.mm", "Info.plist" @@ -22,7 +22,7 @@ QbsApp { } Properties { - condition: qbs.targetOS.contains("osx") + condition: qbs.targetOS.contains("macos") cpp.frameworks: ["ApplicationServices", "Cocoa"] } diff --git a/src/app/config-ui/fgapp.mm b/src/app/config-ui/fgapp.mm index ce3f6e0fe..dff92bb40 100644 --- a/src/app/config-ui/fgapp.mm +++ b/src/app/config-ui/fgapp.mm @@ -31,7 +31,7 @@ #import <AppKit/AppKit.h> #include <ApplicationServices/ApplicationServices.h> -extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate() +extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate() { [[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyRegular]; [[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; diff --git a/src/app/config-ui/main.cpp b/src/app/config-ui/main.cpp index e5c0876b7..5331f9915 100644 --- a/src/app/config-ui/main.cpp +++ b/src/app/config-ui/main.cpp @@ -40,7 +40,7 @@ using qbs::Internal::Tr; -extern "C" void qt_osx_forceTransformProcessToForegroundApplicationAndActivate(); +extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate(); int main(int argc, char *argv[]) { @@ -62,8 +62,8 @@ int main(int argc, char *argv[]) // just before UI is shown - this prevents the application icon from popping up in the Dock // when running `qbs help`, and QCoreApplication::arguments() requires the application object // to be constructed, so it is not easily worked around -#ifdef Q_OS_OSX - qt_osx_forceTransformProcessToForegroundApplicationAndActivate(); +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) + qt_macos_forceTransformProcessToForegroundApplicationAndActivate(); #endif MainWindow mw(clParser.settingsDir()); mw.show(); |